escapek-commits Mailing List for Escape-K

Status: Pre-Alpha

Brought to you by: nicolasjouanin

escapek-commits — CVS commits

You can subscribe to this list here.

2006	_Jan	_Feb	_Mar	_Apr (19)	_May (63)	_Jun (69)	_Jul (74)	_Aug (74)	_Sep (236)	_Oct (316)	_Nov (22)	_Dec (73)
2007	_Jan (20)	_Feb (12)	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2008	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep (15)	_Oct	_Nov (2)	_Dec

Flat | Threaded

1 2 3 .. 40 > >> (Page 1 of 40)

[Escapek-commits] SF.net SVN: escapek:[833] escapek-modules/trunk/gui-objectmanager-ui/src/ main/java/org/escapek/gui/objectmanager/ui/providers/ InstanceViewLabelProvider.java

From: <nic...@us...> - 2008-11-01 17:04:56

Revision: 833
          http://escapek.svn.sourceforge.net/escapek/?rev=833&view=rev
Author:   nicolasjouanin
Date:     2008-11-01 17:04:52 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
Fix instance name display

Modified Paths:
--------------
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewLabelProvider.java

Modified: escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewLabelProvider.java
===================================================================
--- escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewLabelProvider.java	2008-11-01 16:53:45 UTC (rev 832)
+++ escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewLabelProvider.java	2008-11-01 17:04:52 UTC (rev 833)
@@ -61,7 +61,7 @@
 		if(element instanceof CIMPropertyInstance) {
 			if(columnIndex == 0) {
 				CIMPropertyInstance pInstance = (CIMPropertyInstance)element;
-				return pInstance.toString();
+				return pInstance.getName();
 			}
 			if(columnIndex == 1) {
 				CIMPropertyInstance pInstance = (CIMPropertyInstance)element;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[832] org.escapek.mofparser/trunk/pom.xml

From: <nic...@us...> - 2008-11-01 16:53:56

Revision: 832
          http://escapek.svn.sourceforge.net/escapek/?rev=832&view=rev
Author:   nicolasjouanin
Date:     2008-11-01 16:53:45 +0000 (Sat, 01 Nov 2008)

Log Message:
-----------
Update version to 1.0 snapshot

Modified Paths:
--------------
    org.escapek.mofparser/trunk/pom.xml

Modified: org.escapek.mofparser/trunk/pom.xml
===================================================================
--- org.escapek.mofparser/trunk/pom.xml	2008-09-06 20:07:43 UTC (rev 831)
+++ org.escapek.mofparser/trunk/pom.xml	2008-11-01 16:53:45 UTC (rev 832)
@@ -24,7 +24,7 @@
 	<packaging>jar</packaging>
 	<name>org.escapek.mofparser</name>
 	<url>http://wiki.escapek.org</url>
-	<version>1.0-m1-SNAPSHOT</version>
+	<version>1.0-SNAPSHOT</version>
 	<description>MOF parser library</description>
 	<licenses>
 		<license>
@@ -287,7 +287,7 @@
 	</reporting>
 	<repositories>
 		<repository>
-			<id>internal</id>
+			<id>escapek.internal</id>
 			<name>EscapeK Managed Internal Repository</name>
 			<url>
 				http://repo.escapek.org/archiva/repository/internal/
@@ -300,7 +300,7 @@
 			</snapshots>
 		</repository>
 		<repository>
-			<id>snapshots</id>
+			<id>escapek.snapshots</id>
 			<name>EscapeK Managed Snapshot Repository</name>
 			<url>
 				http://repo.escapek.org/archiva/repository/snapshots/
@@ -325,14 +325,14 @@
 			</url>
 		</site>
 		<repository>
-			<id>internal</id>
+			<id>escapek.internal</id>
 			<name>EscapeK Managed Internal Repository</name>
 			<url>
 				http://repo.escapek.org/archiva/repository/internal/
 			</url>
 		</repository>
 		<snapshotRepository>
-			<id>snapshots</id>
+			<id>escapek.snapshots</id>
 			<name>EscapeK Managed Snapshot Repository</name>
 			<url>
 				http://repo.escapek.org/archiva/repository/snapshots


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[831] projectManagement/trunk/EKPlanning.xml

From: <nic...@us...> - 2008-09-06 20:07:46

Revision: 831
          http://escapek.svn.sourceforge.net/escapek/?rev=831&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:07:43 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    projectManagement/trunk/EKPlanning.xml

Added: projectManagement/trunk/EKPlanning.xml
===================================================================
--- projectManagement/trunk/EKPlanning.xml	                        (rev 0)
+++ projectManagement/trunk/EKPlanning.xml	2008-09-06 20:07:43 UTC (rev 831)
@@ -0,0 +1,641 @@
+<?xml version="1.0"?>
+<WORKBENCH_PROJECT>
+    <BaseCalendars>
+      <Calendar
+        name="Standard">
+      </Calendar>
+    </BaseCalendars>
+    <PoolResources>
+      <PoolResource
+        resourceType="0" userFlag2="false" userFlag1="false" fullName="Nicolas JOUANIN" firstName="Nicolas"
+        isExternal="false" isActive="true" resourceId="NJ" employmentType="300" openForTimeEntry="false"
+        hireDate="2008-02-01T08:00:00" lastName="JOUANIN" category="Design Team" isRole="false"
+        trackMode="2">
+        <Calendar baseCalendar="Standard">
+          <Days>
+            <Day start="2008-06-13" isWorkDay="false"/>
+            <Day start="2008-06-16" finish="2008-06-17" isWorkDay="false"/>
+            <Day start="2008-07-14" finish="2008-07-25" isWorkDay="false"/>
+            <Day start="2008-08-18" finish="2008-08-29" isWorkDay="false"/>
+          </Days>
+        </Calendar>
+        <Curve name="availability" type="1" default="1.0"/>
+        <Notes>
+          <Note
+            createdBy="Unknown" createdDate="2008-05-08T13:40:54" content="Nicolas JOUANIN is a Design Team member&#xD;&#xA;He is also one of the conceptor of EscapeK initiative"
+            lastUpdatedDate="2008-05-08T14:10:20" category="Information" lastUpdatedBy="Unknown"/>
+          <Note
+            createdBy="Unknown" createdDate="2008-05-08T14:14:28" content="France" category="Country"/>
+        </Notes>
+      </PoolResource>
+      <PoolResource
+        resourceType="0" userFlag2="false" userFlag1="false" fullName="Jérôme BESSE" firstName="Jérôme"
+        isExternal="false" isActive="true" resourceId="JB" employmentType="300" openForTimeEntry="false"
+        hireDate="2008-02-01T08:00:00" lastName="BESSE" category="Design Team" isRole="false"
+        trackMode="2">
+        <Calendar baseCalendar="Standard">
+        </Calendar>
+        <Curve name="availability" type="1" default="1.0"/>
+        <Notes>
+          <Note
+            createdBy="Unknown" createdDate="2008-05-08T13:41:41" content="Jérôme BESSE est membre du Design Team.&#xD;&#xA;Il est aussi l&apos;un des fondateurs d&apos;EscapeK."
+            lastUpdatedDate="2008-05-08T14:15:25" category="Information" lastUpdatedBy="Unknown"/>
+          <Note
+            createdBy="Unknown" createdDate="2008-05-08T14:14:40" content="France" category="Country"/>
+        </Notes>
+      </PoolResource>
+    </PoolResources>
+  <Projects>
+    <Project
+      UID="AJ].Y2`/-_```3;E^=QH!```?P```0" closed="false" active="true" approved="false"
+      start="2008-04-07T08:00:00" openForTimeEntry="true" format="0" trackMode="0" finish="2009-01-01T08:00:00"
+      priority="10" finishImposed="false" cpmType="0" name="EscapeK" projectID="EK" startImposed="false"
+      program="false">
+      <Resources>
+        <Resource
+          requestStatus="1" resourceID="NJ" openForTimeEntry="true" bookingStatus="5">
+          <Curve name="allocation" type="1" default="1.0"/>
+          <Curve name="rate" type="1" default="2.777777777777778E-4"/>
+        </Resource>
+        <Resource
+          requestStatus="1" resourceID="JB" openForTimeEntry="true" bookingStatus="5">
+          <Curve name="allocation" type="1" default="1.0"/>
+          <Curve name="rate" type="1" default="2.777777777777778E-4"/>
+        </Resource>
+      </Resources>
+      <Tasks>
+        <Task
+          start="2008-04-07T08:00:00" proxy="false" critical="false" status="1" outlineLevel="1"
+          finish="2008-05-16T17:00:00" summary="true" milestone="false" name="Initial design"
+          taskID="INIT" fixed="false" locked="false" key="false" percComp="0.0" unplanned="false"/>
+        <Task
+          earlyStart="2008-04-07T08:00:00" lateStart="2008-04-07T08:00:00" start="2008-04-07T08:00:00"
+          proxy="false" earlyFinish="2008-04-07T17:00:00" lateFinish="2008-04-07T17:00:00"
+          critical="true" status="2" outlineLevel="2" finish="2008-04-07T17:00:00" summary="false"
+          milestone="false" name="HYPERVISION module conceptual design" taskID="INIT-1" fixed="false"
+          locked="false" key="false" percComp="1.0" totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="JB" start="2008-04-07T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-04-07T17:00:00" finish="2008-04-07T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-04-07T08:00:00" finish="2008-04-07T17:00:00" rate="0.625"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          earlyStart="2008-04-14T08:00:00" lateStart="2008-04-14T08:00:00" start="2008-04-14T08:00:00"
+          proxy="false" earlyFinish="2008-04-14T17:00:00" lateFinish="2008-04-14T17:00:00"
+          critical="true" status="2" outlineLevel="2" finish="2008-04-14T17:00:00" summary="false"
+          milestone="false" name="INVENTORY module conceptual design" taskID="INIT-2" fixed="false"
+          locked="false" key="false" percComp="1.0" totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="JB" start="2008-04-14T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-04-14T17:00:00" finish="2008-04-14T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-04-14T08:00:00" finish="2008-04-14T17:00:00" rate="0.625"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          earlyStart="2008-04-16T08:00:00" lateStart="2008-04-16T08:00:00" start="2008-04-16T08:00:00"
+          proxy="false" earlyFinish="2008-04-16T17:00:00" lateFinish="2008-04-16T17:00:00"
+          critical="true" status="2" outlineLevel="2" finish="2008-04-16T17:00:00" summary="false"
+          milestone="false" name="HELPDESK module conceptual design" taskID="INIT-3" fixed="false"
+          locked="false" key="false" percComp="1.0" totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="JB" start="2008-04-16T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-04-16T17:00:00" finish="2008-04-16T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-04-16T08:00:00" finish="2008-04-16T17:00:00" rate="0.625"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          earlyStart="2008-04-21T08:00:00" lateStart="2008-04-21T08:00:00" start="2008-04-21T08:00:00"
+          proxy="false" earlyFinish="2008-04-21T17:00:00" lateFinish="2008-04-21T17:00:00"
+          critical="true" status="2" outlineLevel="2" finish="2008-04-21T17:00:00" summary="false"
+          milestone="false" name="MAINTENANCE module conceptual design" taskID="INIT-4" fixed="false"
+          locked="false" key="false" percComp="1.0" totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="JB" start="2008-04-21T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-04-21T17:00:00" finish="2008-04-21T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-04-21T08:00:00" finish="2008-04-21T17:00:00" rate="0.625"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          earlyStart="2008-04-23T08:00:00" lateStart="2008-04-23T08:00:00" start="2008-04-23T08:00:00"
+          proxy="false" earlyFinish="2008-04-23T17:00:00" lateFinish="2008-04-23T17:00:00"
+          critical="true" status="2" outlineLevel="2" finish="2008-04-23T17:00:00" summary="false"
+          milestone="false" name="MANAGEMENT module conceptual design" taskID="INIT-5" fixed="false"
+          locked="false" key="false" percComp="1.0" totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="JB" start="2008-04-23T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-04-23T17:00:00" finish="2008-04-23T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-04-23T08:00:00" finish="2008-04-23T17:00:00" rate="0.625"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          earlyStart="2008-04-25T08:00:00" lateStart="2008-04-25T08:00:00" start="2008-04-25T08:00:00"
+          proxy="false" earlyFinish="2008-04-25T17:00:00" lateFinish="2008-04-25T17:00:00"
+          critical="true" status="2" outlineLevel="2" finish="2008-04-25T17:00:00" summary="false"
+          milestone="false" name="DIRECTORY module conceptual design" taskID="INIT-6" fixed="false"
+          locked="false" key="false" percComp="1.0" totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="JB" start="2008-04-25T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-04-25T17:00:00" finish="2008-04-25T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-04-25T08:00:00" finish="2008-04-25T17:00:00" rate="0.625"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          earlyStart="2008-05-16T08:00:00" lateStart="2008-06-12T08:00:00" start="2008-05-16T08:00:00"
+          proxy="false" earlyFinish="2008-05-16T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="0" outlineLevel="2" finish="2008-05-16T17:00:00" summary="false"
+          milestone="false" name="BUSINESS module conceptual design" taskID="INIT-7" fixed="false"
+          locked="false" key="false" percComp="0.0" totalSlack="19.0" unplanned="false"/>
+        <Task
+          start="2008-05-15T08:00:00" proxy="false" critical="false" status="1" outlineLevel="1"
+          finish="2009-01-01T08:00:00" summary="true" priority="1" milestone="false" name="0.1 release"
+          taskID="0.1" fixed="false" locked="false" key="false" percComp="0.0" unplanned="false"/>
+        <Task
+          UID="AJL?6B`&gt;E_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-05-16T08:00:00"
+          start="2008-05-16T08:00:00" proxy="false" earlyFinish="2008-05-16T17:00:00" lateFinish="2008-05-16T17:00:00"
+          critical="true" status="1" outlineLevel="2" finish="2008-05-16T17:00:00" summary="false"
+          milestone="false" name="Planning" fixed="false" locked="false" key="false" percComp="0.25"
+          totalSlack="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="1" resourceID="NJ" start="2008-05-16T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-05-16T12:00:00" finish="2008-05-16T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-05-16T08:00:00" finish="2008-05-16T12:00:00" rate="1.0">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+              </Segments>
+              </Curve>
+              <Curve name="estimates" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-05-16T13:00:00" finish="2008-05-16T17:00:00" rate="1.0">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+              </Segments>
+              </Curve>
+            </Assignment>
+            <Assignment
+              status="0" resourceID="JB" start="2008-05-16T08:00:00" unplanned="false" estPattern="3"
+              finish="2008-05-16T17:00:00" estMax="1.0">
+              <Curve name="estimates" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-05-16T08:00:00" finish="2008-05-16T17:00:00" rate="1.0"/>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          UID="AJP&apos;&amp;P`&gt;A_```3;E^=QH!```?P```0" start="2008-05-19T08:00:00" proxy="false" critical="false"
+          status="1" outlineLevel="2" finish="2008-07-18T17:00:00" summary="true" priority="5"
+          milestone="false" name="Design" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false"/>
+        <Task
+          UID="AJ&apos;?7[`.=_```3;E^=QH!```?P```0" start="2008-05-19T08:00:00" proxy="false" critical="false"
+          status="2" outlineLevel="3" finish="2008-05-20T15:28:34" summary="false" milestone="false"
+          name="Technical environment design" fixed="false" locked="false" key="false" percComp="1.0"
+          unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="NJ" start="2008-05-19T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-05-20T15:28:34" finish="2008-05-20T15:28:34" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-05-19T08:00:00" finish="2008-05-19T17:00:00" rate="0.37500390629069047">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+                <Segment start="2008-05-20T08:00:00" finish="2008-05-20T15:28:34" rate="2.6250273440348333">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          UID="AJ49A.`=9_```3;E^=QH!```?P```0" start="2008-06-04T08:00:00" proxy="false" critical="false"
+          status="1" outlineLevel="3" finish="2008-06-17T17:00:00" summary="false" milestone="false"
+          name="HelpDesk design" fixed="true" locked="false" key="false" percComp="0.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="0" resourceID="JB" unplanned="false" estPattern="3" estMax="1.0">
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          UID="AJT?KQ`-5_```3;E^=QH!```?P```0" start="2008-07-05T00:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="3" finish="2008-07-18T17:00:00" summary="false" milestone="false"
+          name="Hypervision design" fixed="true" locked="false" key="false" percComp="0.0"
+          unplanned="false">
+          <Assignments>
+            <Assignment
+              status="0" resourceID="NJ" unplanned="false" estPattern="3" estMax="1.0">
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          UID="AJFBV$`.9_```3;E^=QH!```?P```0" start="2008-05-22T08:00:00" proxy="false" critical="false"
+          status="1" outlineLevel="2" finish="2008-06-18T17:00:00" summary="true" priority="10"
+          milestone="false" name="Development" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false"/>
+        <Task
+          UID="AJM`#.`&gt;5_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-06-06T08:00:00"
+          start="2008-05-22T08:00:00" proxy="false" earlyFinish="2008-05-22T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="2" outlineLevel="3" finish="2008-06-04T17:00:00" summary="false"
+          milestone="false" name="Development environment setup" fixed="true" locked="false"
+          key="false" percComp="1.0" totalSlack="10.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="2" resourceID="NJ" start="2008-05-22T08:00:00" unplanned="false" estPattern="3"
+              actualThrough="2008-05-22T17:00:00" finish="2008-05-22T17:00:00" estMax="1.0">
+              <Curve name="actuals" type="2" default="0.0">
+              <Segments>
+                <Segment start="2008-05-22T08:00:00" finish="2008-05-22T13:00:00" rate="5.0">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+                <Segment start="2008-05-22T13:00:00" finish="2008-05-22T15:00:00" rate="5.0">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+                <Segment start="2008-05-22T15:00:00" finish="2008-05-22T17:00:00" rate="5.0">
+                  <Calendar>
+                    <Days>
+                      <Day dayOfWeek="SUN" isWorkDay="false"/>
+                      <Day dayOfWeek="MON" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="TUE" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="WED" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="THU" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="FRI" isWorkDay="true">
+                      <Shifts>
+                        <Shift start="08:00:00" finish="12:00:00"/>
+                        <Shift start="13:00:00" finish="17:00:00"/>
+                      </Shifts>
+                      </Day>
+                      <Day dayOfWeek="SAT" isWorkDay="false"/>
+                    </Days>
+                  </Calendar>
+                </Segment>
+              </Segments>
+              </Curve>
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          UID="AJY6&gt;0`&gt;1_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-05-16T08:00:00"
+          start="2008-06-05T08:00:00" proxy="false" earlyFinish="2008-06-12T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="1" outlineLevel="3" finish="2008-06-18T17:00:00" summary="false"
+          milestone="false" name="Core development" fixed="false" locked="false" key="false"
+          percComp="0.0" totalSlack="10.0" unplanned="false">
+          <Assignments>
+            <Assignment
+              status="0" resourceID="NJ" unplanned="false" estPattern="3" estMax="1.0">
+            </Assignment>
+          </Assignments>
+        </Task>
+        <Task
+          UID="AJ&quot;@Z5`&gt;-_```3;E^=QH!```?P```0" start="2008-06-20T08:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="2" finish="2008-07-03T17:00:00" summary="true" priority="15"
+          milestone="false" name="Documentation" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false"/>
+        <Task
+          UID="AJ&apos;-+,`.)_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-06-06T08:00:00"
+          start="2008-06-20T08:00:00" proxy="false" earlyFinish="2008-05-22T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="0" outlineLevel="3" finish="2008-06-26T17:00:00" summary="false"
+          milestone="false" name="Installation documentation" fixed="false" locked="false"
+          key="false" percComp="0.0" totalSlack="15.0" unplanned="false"/>
+        <Task
+          UID="AJNB[V`.%_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-06-06T08:00:00"
+          start="2008-06-27T08:00:00" proxy="false" earlyFinish="2008-05-22T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="0" outlineLevel="3" finish="2008-07-03T17:00:00" summary="false"
+          milestone="false" name="Development environment documentation" fixed="false" locked="false"
+          key="false" percComp="0.0" totalSlack="15.0" unplanned="false"/>
+        <Task
+          UID="AJ1,=U`.!_```3;E^=QH!```?P```0" start="2008-05-15T08:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="2" finish="2008-05-15T17:00:00" summary="true" priority="20"
+          milestone="false" name="Review" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false"/>
+        <Task
+          UID="AJH&amp;IM`-]_```3;E^=QH!```?P```0" start="2008-05-15T08:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="2" finish="2008-05-15T08:00:00" summary="true" priority="25"
+          milestone="false" name="Deployment" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false"/>
+        <Task
+          UID="AJXF%S`=Y_```3;E^=QH!```?P```0" start="2009-01-01T08:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="2" finish="2009-01-01T08:00:00" summary="true" priority="30"
+          milestone="false" name="Support" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false"/>
+        <Task
+          UID="AJ(6,?`-U_```3;E^=QH!```?P```0" start="2009-01-01T08:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="3" finish="2009-01-01T08:00:00" summary="false" milestone="true"
+          name="RELEASE" fixed="true" locked="false" key="true" percComp="0.0" unplanned="false"/>
+        <Task
+          start="2008-05-16T08:00:00" proxy="false" critical="false" status="0" outlineLevel="1"
+          finish="2008-09-12T17:00:00" summary="true" milestone="false" name="Project management"
+          taskID="EKMan" fixed="false" locked="false" key="false" percComp="0.0" unplanned="false"/>
+        <Task
+          UID="AJU)XB`-M_```3;E^=QH!```?P```0" start="2008-09-01T08:00:00" proxy="false" critical="false"
+          status="0" outlineLevel="2" finish="2008-09-12T17:00:00" summary="false" milestone="false"
+          name="Migrate server to Dedibox v2" fixed="false" locked="false" key="false" percComp="0.0"
+          unplanned="false">
+          <Assignments>
+            <Assignment
+              status="0" resourceID="NJ" unplanned="false" estPattern="3" estMax="1.0">
+            </Assignment>
+          </Assignments>
+          <Notes>
+            <Note
+              createdBy="Unknown" createdDate="2008-05-22T15:25:40" content="Technical task : Hire a new Dedibox v2 to migrate all current services to this more powerfull platform.&#xD;&#xA;See if RAID option is needed."/>
+          </Notes>
+        </Task>
+        <Task
+          start="2008-05-16T08:00:00" proxy="false" critical="false" status="0" outlineLevel="2"
+          finish="2008-05-16T17:00:00" summary="true" milestone="false" name="Website" taskID="EKMan-W"
+          fixed="false" locked="false" key="false" percComp="0.0" unplanned="false"/>
+        <Task
+          UID="AJ&amp;]T$`-E_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-06-12T08:00:00"
+          start="2008-05-16T08:00:00" proxy="false" earlyFinish="2008-05-16T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="0" outlineLevel="3" finish="2008-05-16T17:00:00" summary="false"
+          milestone="false" name="Wiki On Air" fixed="false" locked="false" key="false" percComp="0.0"
+          totalSlack="19.0" unplanned="false"/>
+        <Task
+          UID="AJ6#10`=A_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-06-12T08:00:00"
+          start="2008-05-16T08:00:00" proxy="false" earlyFinish="2008-05-16T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="0" outlineLevel="3" finish="2008-05-16T17:00:00" summary="false"
+          milestone="false" name="Www On Air" fixed="false" locked="false" key="false" percComp="0.0"
+          totalSlack="19.0" unplanned="false"/>
+        <Task
+          UID="AJ^Z&amp;&lt;`-=_```3;E^=QH!```?P```0" earlyStart="2008-05-16T08:00:00" lateStart="2008-06-12T08:00:00"
+          start="2008-05-16T08:00:00" proxy="false" earlyFinish="2008-05-16T17:00:00" lateFinish="2008-06-12T17:00:00"
+          critical="false" status="0" outlineLevel="3" finish="2008-05-16T17:00:00" summary="false"
+          milestone="false" name="Bug On Air" fixed="false" locked="false" key="false" percComp="0.0"
+          totalSlack="19.0" unplanned="false"/>
+      </Tasks>
+    </Project>
+  </Projects>
+</WORKBENCH_PROJECT>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[830] projectDesign/trunk

From: <nic...@us...> - 2008-09-06 20:07:11

Revision: 830
          http://escapek.svn.sourceforge.net/escapek/?rev=830&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:07:09 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    projectDesign/trunk/.project
    projectDesign/trunk/analyse.di2
    projectDesign/trunk/analyse.uml

Added: projectDesign/trunk/.project
===================================================================
--- projectDesign/trunk/.project	                        (rev 0)
+++ projectDesign/trunk/.project	2008-09-06 20:07:09 UTC (rev 830)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>EscapeK</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Added: projectDesign/trunk/analyse.di2
===================================================================
--- projectDesign/trunk/analyse.di2	                        (rev 0)
+++ projectDesign/trunk/analyse.di2	2008-09-06 20:07:09 UTC (rev 830)
@@ -0,0 +1,1292 @@
+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di2="http://www.papyrusuml.org" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML">
+  <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="General architecture">
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="48:48" size="181:184">
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="11:25" size="145:38">
+        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+          <element xsi:type="uml:Package" href="analyse.uml#_smcmEPpZEdyhDdJIPb__HA"/>
+        </semanticModel>
+      </contained>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="11:70" size="145:38">
+        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+          <element xsi:type="uml:Package" href="analyse.uml#_9JqusPqDEdyeBrS0u6UEOw"/>
+        </semanticModel>
+      </contained>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="11:119" size="145:38">
+        <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+          <element xsi:type="uml:Package" href="analyse.uml#_pFPk0PqIEdyKd_xRbQnaPQ"/>
+        </semanticModel>
+      </contained>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Package" href="analyse.uml#_8Wt9sPpVEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="140:232" graphEdge="/0/@contained.4"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="264:48" size="186:123">
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Package" href="analyse.uml#_tLsvkPpWEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="362:171" graphEdge="/0/@contained.6"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="480:48" size="186:123">
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Package" href="analyse.uml#_F9-WYPpXEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="571:171" graphEdge="/0/@contained.8"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="206:210:253" borderColor="157:124:47" position="48:288" size="182:112">
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Comment" href="analyse.uml#_zgw-wPpXEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="139:287" graphEdge="/0/@contained.4"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/0/@contained.3/@anchorage.0 /0/@contained.0/@anchorage.0"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="206:210:253" borderColor="157:124:47" position="288:288" size="157:73">
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Comment" href="analyse.uml#_4CBsIPtXEdyGUdlV0FGudQ"/>
+      </semanticModel>
+      <anchorage position="362:287" graphEdge="/0/@contained.6"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/0/@contained.5/@anchorage.0 /0/@contained.1/@anchorage.0"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="206:210:253" borderColor="157:124:47" position="506:288" size="133:49">
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Comment" href="analyse.uml#_ghdvYPtYEdyGUdlV0FGudQ"/>
+      </semanticModel>
+      <anchorage position="571:287" graphEdge="/0/@contained.8"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/0/@contained.7/@anchorage.0 /0/@contained.2/@anchorage.0"/>
+    <owner xsi:type="di2:Uml1SemanticModelBridge">
+      <element xsi:type="uml:Model" href="analyse.uml#_6AyBEPpVEdyhDdJIPb__HA"/>
+    </owner>
+  </di2:Diagram>
+  <di2:Diagram fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Use Case diagram of Systems administration" type="UseCaseDiagram">
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.1" position="84:148" size="49:85">
+      <property key="NodeFigureAppearance" value="ActorStickmanForm"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Actor" href="analyse.uml#_j3w-sPpZEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="133:184" graphEdge="/1/@contained.12"/>
+      <anchorage position="133:184" graphEdge="/1/@contained.13"/>
+      <anchorage position="133:184" graphEdge="/1/@contained.14"/>
+      <anchorage position="133:183" graphEdge="/1/@contained.15"/>
+      <anchorage position="133:184" graphEdge="/1/@contained.16"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.0" position="63:244" size="104:11"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.3" position="258:177" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.2" position="228:72" size="125:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_KwdtoPpaEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="228:108" graphEdge="/1/@contained.13"/>
+      <anchorage position="352:108" graphEdge="/1/@contained.23"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.5" position="258:345" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.4" position="228:240" size="125:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_5d29kPp-EdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="228:277" graphEdge="/1/@contained.15"/>
+      <anchorage position="351:266" graphEdge="/1/@contained.25"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.7" position="258:429" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.6" position="228:324" size="125:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#__s-yQPp-EdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="228:360" graphEdge="/1/@contained.16"/>
+      <anchorage position="352:360" graphEdge="/1/@contained.26"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.9" position="258:261" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.8" position="228:156" size="125:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="HorizontalStereo">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_JPq-kPqBEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="231:201" graphEdge="/1/@contained.14"/>
+      <anchorage position="352:193" graphEdge="/1/@contained.24"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.11" position="258:93" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.10" position="228:-12" size="125:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_dX6fMPqBEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="228:24" graphEdge="/1/@contained.12"/>
+      <anchorage position="352:24" graphEdge="/1/@contained.22"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.0 /1/@contained.11/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:0" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:0" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-40" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="60:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_529dQPqCEdyEoKKdYiNh5g"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.1 /1/@contained.3/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_8Md8EPqCEdyEoKKdYiNh5g"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.2 /1/@contained.9/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_AdJuIPqDEdyEoKKdYiNh5g"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.3 /1/@contained.5/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-60" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_CEXjkPqDEdyEoKKdYiNh5g"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.0/@anchorage.4 /1/@contained.7/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-60" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_EPhzkPqDEdyEoKKdYiNh5g"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.18" position="486:261" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.17" position="456:156" size="169:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_WY1s4PqEEdyeBrS0u6UEOw"/>
+      </semanticModel>
+      <anchorage position="624:194" graphEdge="/1/@contained.21"/>
+      <anchorage position="481:165" graphEdge="/1/@contained.22"/>
+      <anchorage position="465:174" graphEdge="/1/@contained.23"/>
+      <anchorage position="456:191" graphEdge="/1/@contained.24"/>
+      <anchorage position="462:204" graphEdge="/1/@contained.25"/>
+      <anchorage position="474:212" graphEdge="/1/@contained.26"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/1/@contained.20" position="702:345" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/1/@contained.19" position="672:240" size="361:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_jB87kPpaEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="698:256" graphEdge="/1/@contained.21"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.18/@anchorage.0 /1/@contained.20/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Generalization" href="analyse.uml#_BnRF8PqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.11/@anchorage.1 /1/@contained.18/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_GszcYPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.3/@anchorage.1 /1/@contained.18/@anchorage.2">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_I3gZYPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.9/@anchorage.1 /1/@contained.18/@anchorage.3">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_KfuUYPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.5/@anchorage.1 /1/@contained.18/@anchorage.4">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_Ml7L4PqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/1/@contained.7/@anchorage.1 /1/@contained.18/@anchorage.5">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_QFPLYPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <owner xsi:type="di2:Uml1SemanticModelBridge">
+      <element xsi:type="uml:Package" href="analyse.uml#_smcmEPpZEdyhDdJIPb__HA"/>
+    </owner>
+  </di2:Diagram>
+  <di2:Diagram fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Use Case diagram of Database administration" type="UseCaseDiagram">
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.1" position="461:321" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.0" position="431:216" size="170:73">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_sBT0sPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="600:249" graphEdge="/2/@contained.4"/>
+      <anchorage position="458:225" graphEdge="/2/@contained.15"/>
+      <anchorage position="437:238" graphEdge="/2/@contained.16"/>
+      <anchorage position="434:263" graphEdge="/2/@contained.17"/>
+      <anchorage position="449:275" graphEdge="/2/@contained.18"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.3" position="674:405" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.2" position="644:300" size="365:73">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_jB87kPpaEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="654:324" graphEdge="/2/@contained.4"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.1/@anchorage.0 /2/@contained.3/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Generalization" href="analyse.uml#_O50rsPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.6" position="36:211" size="61:84">
+      <property key="NodeFigureAppearance" value="ActorStickmanForm"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Actor" href="analyse.uml#_e9624PqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="97:246" graphEdge="/2/@contained.19"/>
+      <anchorage position="97:248" graphEdge="/2/@contained.20"/>
+      <anchorage position="97:247" graphEdge="/2/@contained.21"/>
+      <anchorage position="97:249" graphEdge="/2/@contained.22"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.5" position="10:312" size="114:11"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.8" position="233:360" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.7" position="203:255" size="137:57">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_wZ17MPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="339:284" graphEdge="/2/@contained.17"/>
+      <anchorage position="202:283" graphEdge="/2/@contained.21"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.10" position="233:291" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.9" position="203:186" size="137:57">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_2Z1HsPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="339:217" graphEdge="/2/@contained.16"/>
+      <anchorage position="202:214" graphEdge="/2/@contained.20"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.12" position="233:436" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.11" position="203:331" size="137:57">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_44DdoPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="339:360" graphEdge="/2/@contained.18"/>
+      <anchorage position="203:360" graphEdge="/2/@contained.22"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/2/@contained.14" position="233:220" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/2/@contained.13" position="203:115" size="137:57">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_8fEnoPqFEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="340:143" graphEdge="/2/@contained.15"/>
+      <anchorage position="202:143" graphEdge="/2/@contained.19"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.14/@anchorage.0 /2/@contained.1/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_p4re0PqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.10/@anchorage.0 /2/@contained.1/@anchorage.2">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_r41YsPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.8/@anchorage.0 /2/@contained.1/@anchorage.3">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_yRinMPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.12/@anchorage.0 /2/@contained.1/@anchorage.4">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_0FM9MPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.5/@anchorage.0 /2/@contained.14/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_3EjDMPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.5/@anchorage.1 /2/@contained.10/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_43N6sPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.5/@anchorage.2 /2/@contained.8/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_60pQsPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/2/@contained.5/@anchorage.3 /2/@contained.12/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-40:-60" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:60" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="40:0" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_8slCsPqGEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <owner xsi:type="di2:Uml1SemanticModelBridge">
+      <element xsi:type="uml:Package" href="analyse.uml#_9JqusPqDEdyeBrS0u6UEOw"/>
+    </owner>
+  </di2:Diagram>
+  <di2:Diagram fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Deployment diagram of System architecture" type="DeploymentDiagram">
+    <owner xsi:type="di2:Uml1SemanticModelBridge">
+      <element xsi:type="uml:Package" href="analyse.uml#_K8nkYPqIEdyKd_xRbQnaPQ"/>
+    </owner>
+  </di2:Diagram>
+  <di2:Diagram fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Use Case diagram of Network administration" type="UseCaseDiagram">
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/4/@contained.1" position="52:194" size="57:83">
+      <property key="NodeFigureAppearance" value="ActorStickmanForm"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Actor" href="analyse.uml#_r8RcUPqIEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="109:232" graphEdge="/4/@contained.10"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/4/@contained.0" position="28:288" size="106:11"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/4/@contained.3" position="450:312" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/4/@contained.2" position="420:207" size="170:58">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_CTrjMPqJEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="575:251" graphEdge="/4/@contained.6"/>
+      <anchorage position="419:234" graphEdge="/4/@contained.9"/>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/4/@contained.5" position="619:403" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/4/@contained.4" position="589:298" size="358:73">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_jB87kPpaEdyhDdJIPb__HA"/>
+      </semanticModel>
+      <anchorage position="635:309" graphEdge="/4/@contained.6"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/4/@contained.3/@anchorage.0 /4/@contained.5/@anchorage.0">
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Generalization" href="analyse.uml#_jpsssPqJEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticParent="/4/@contained.8" position="210:306" size="100:100"/>
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/4/@contained.7" position="180:201" size="181:70">
+      <property key="NodeFigureAppearance" value="UseCaseEllipseForm"/>
+      <contained xsi:type="di2:GraphNode"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:UseCase" href="analyse.uml#_HXA6MPqJEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+      <anchorage position="360:234" graphEdge="/4/@contained.9"/>
+      <anchorage position="180:233" graphEdge="/4/@contained.10"/>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/4/@contained.8/@anchorage.0 /4/@contained.3/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:10" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:30" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Include" href="analyse.uml#_rAR4sPqJEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <contained xsi:type="di2:GraphEdge" isVisible="true" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="0:0:0" backgroundColor="0:0:0" borderColor="0:0:0" anchor="/4/@contained.0/@anchorage.0 /4/@contained.8/@anchorage.1">
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:-20" size="100:100">
+        <property key="custom_disp" value="1166"/>
+      </contained>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="-60:-20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" fontFamily="Arial" fontSize="9" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="20:20" size="100:100"/>
+      <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" position="0:-20" size="100:100"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Association" href="analyse.uml#_tjjGsPqJEdyKd_xRbQnaPQ"/>
+      </semanticModel>
+    </contained>
+    <owner xsi:type="di2:Uml1SemanticModelBridge">
+      <element xsi:type="uml:Package" href="analyse.uml#_pFPk0PqIEdyKd_xRbQnaPQ"/>
+    </owner>
+  </di2:Diagram>
+  <di2:Diagram isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="255:255:255" foregroundColor="255:255:255" backgroundColor="255:255:255" borderColor="255:255:255" position="0:0" name="Use Case diagram of Monitoring and reporting" type="UseCaseDiagram">
+    <contained xsi:type="di2:GraphNode" isVisible="true" fontFamily="Arial" lineStyle="solid" fontColor="0:0:0" foregroundColor="248:249:214" backgroundColor="248:249:214" borderColor="157:124:47" semanticChild="/5/@contained.1" position="49:217" size="60:84">
+      <property key="NodeFigureAppearance" value="ActorStickmanForm"/>
+      <semanticModel xsi:type="di2:Uml1SemanticModelBridge" presentation="TextStereotype">
+        <element xsi:type="uml:Actor" href="analyse...
 
[truncated message content]

[Escapek-commits] SF.net SVN: escapek:[829] osgi-repo/trunk

From: <nic...@us...> - 2008-09-06 20:06:40

Revision: 829
          http://escapek.svn.sourceforge.net/escapek/?rev=829&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:06:34 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    osgi-repo/trunk/.project
    osgi-repo/trunk/h2/
    osgi-repo/trunk/h2/pom.xml
    osgi-repo/trunk/hibernate/
    osgi-repo/trunk/hibernate/pom.xml
    osgi-repo/trunk/pom.xml
    osgi-repo/trunk/stringtemplate/
    osgi-repo/trunk/stringtemplate/pom.xml
    osgi-repo/trunk/stringtemplate/src/
    osgi-repo/trunk/stringtemplate/src/main/
    osgi-repo/trunk/stringtemplate/src/main/resources/
    osgi-repo/trunk/stringtemplate/src/main/resources/stringtemplate.jar
    osgi-repo/trunk/xstream.osgi/
    osgi-repo/trunk/xstream.osgi/META-INF/
    osgi-repo/trunk/xstream.osgi/META-INF/MANIFEST.MF
    osgi-repo/trunk/xstream.osgi/pom.xml

Added: osgi-repo/trunk/.project
===================================================================
--- osgi-repo/trunk/.project	                        (rev 0)
+++ osgi-repo/trunk/.project	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>osgi-repo</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>

Added: osgi-repo/trunk/h2/pom.xml
===================================================================
--- osgi-repo/trunk/h2/pom.xml	                        (rev 0)
+++ osgi-repo/trunk/h2/pom.xml	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright 2008 EscapeK
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.escapek.osgi</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>h2</artifactId>
+	<version>1.0.76</version>
+	<name>H2 database OSGi bundle</name>
+	<packaging>bundle</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.0.76</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>org.h2.*</Export-Package>
+						<Import-Package>*;resolution:=optional</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<pde>true</pde>
+					<projectnatures>
+						<projectnature>org.eclipse.pde.PluginNature</projectnature>
+						<projectnature>org.eclipse.jdt.core.javanature</projectnature>
+						<projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
+					</projectnatures>
+					<classpathContainers>
+						<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+						<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+						<classpathContainer>org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER</classpathContainer>
+					</classpathContainers>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file

Added: osgi-repo/trunk/hibernate/pom.xml
===================================================================
--- osgi-repo/trunk/hibernate/pom.xml	                        (rev 0)
+++ osgi-repo/trunk/hibernate/pom.xml	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Copyright 2008 EscapeK
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.escapek.osgi</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>hibernate</artifactId>
+	<version>3.2.6.ga</version>
+	<name>Hibernate OSGi bundle</name>
+	<packaging>bundle</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<version>3.2.6.ga</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-annotations</artifactId>
+			<version>3.3.0.ga</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-commons-annotations</artifactId>
+			<version>3.3.0.ga</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.transaction</groupId>
+			<artifactId>com.springsource.javax.transaction</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.ant</groupId>
+			<artifactId>com.springsource.org.apache.tools.ant</artifactId>
+			<version>1.7.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.collections</artifactId>
+			<version>3.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.logging</artifactId>
+			<version>1.1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>com.springsource.antlr</artifactId>
+			<version>2.7.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.mchange.c3p0</groupId>
+			<artifactId>com.springsource.com.mchange.v2.c3p0</artifactId>
+			<version>0.9.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.opensymphony.oscache</groupId>
+			<artifactId>com.springsource.com.opensymphony.oscache</artifactId>
+			<version>2.1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.javassist</groupId>
+			<artifactId>com.springsource.javassist</artifactId>
+			<version>3.3.0.ga</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.cglib</groupId>
+			<artifactId>com.springsource.net.sf.cglib</artifactId>
+			<version>2.1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.ehcache</groupId>
+			<artifactId>com.springsource.net.sf.ehcache</artifactId>
+			<version>1.2.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.swarmcache</groupId>
+			<artifactId>com.springsource.net.sf.swarmcache</artifactId>
+			<version>1.0.0.RC2a</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.dom4j</groupId>
+			<artifactId>com.springsource.org.dom4j</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.logicalcobwebs</groupId>
+			<artifactId>com.springsource.org.logicalcobwebs.proxool</artifactId>
+			<version>0.8.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm</artifactId>
+			<version>1.5.3</version>
+		</dependency>
+		<dependency>
+			<groupId>org.objectweb.asm</groupId>
+			<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+			<version>1.5.3</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							org.hibernate*;version=${project.version};-split-package:=merge-last
+						</Export-Package>
+						<Eclipse-BuddyPolicy>
+							registered
+						</Eclipse-BuddyPolicy>
+						<Import-Package>
+							antlr.*;version="2.7.7";resolution:=optional,*;resolution:=optional
+						</Import-Package>
+<!-- 						<Embed-Transitive>true</Embed-Transitive> -->
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<pde>true</pde>
+					<projectnatures>
+						<projectnature>
+							org.eclipse.pde.PluginNature
+						</projectnature>
+						<projectnature>
+							org.eclipse.jdt.core.javanature
+						</projectnature>
+						<projectnature>
+							org.maven.ide.eclipse.maven2Nature
+						</projectnature>
+					</projectnatures>
+					<classpathContainers>
+						<classpathContainer>
+							org.eclipse.jdt.launching.JRE_CONTAINER
+						</classpathContainer>
+						<classpathContainer>
+							org.eclipse.pde.core.requiredPlugins
+						</classpathContainer>
+						<classpathContainer>
+							org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER
+						</classpathContainer>
+					</classpathContainers>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+
+</project>
\ No newline at end of file

Added: osgi-repo/trunk/pom.xml
===================================================================
--- osgi-repo/trunk/pom.xml	                        (rev 0)
+++ osgi-repo/trunk/pom.xml	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Copyright 2008 EscapeK
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.escapek.osgi</groupId>
+	<artifactId>parent</artifactId>
+	<packaging>pom</packaging>
+	<version>0.1-SNAPSHOT</version>
+
+	<modules>
+		<module>xstream.osgi</module>
+		<module>hibernate</module>
+		<module>stringtemplate</module>
+	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<pde>true</pde>
+					<projectnatures>
+						<projectnature>org.eclipse.pde.PluginNature</projectnature>
+						<projectnature>org.eclipse.jdt.core.javanature</projectnature>
+						<projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
+					</projectnatures>
+					<classpathContainers>
+						<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+						<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+						<classpathContainer>org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER</classpathContainer>
+					</classpathContainers>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<repositories>
+		<repository>
+			<id>escapek.internal</id>
+			<name>EscapeK Managed Internal Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/internal/
+			</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>escapek.snapshots</id>
+			<name>EscapeK Managed Snapshot Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/snapshots/
+			</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<distributionManagement>
+		<!-- Releases distribution. -->
+		<repository>
+			<id>escapek.internal</id>
+			<name>EscapeK Managed Internal Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/internal/
+			</url>
+		</repository>
+		<!-- Snapshots distribution. -->
+		<snapshotRepository>
+			<id>escapek.snapshots</id>
+			<name>EscapeK Managed Snapshot Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/snapshots
+			</url>
+		</snapshotRepository>
+	</distributionManagement>
+</project>
\ No newline at end of file

Added: osgi-repo/trunk/stringtemplate/pom.xml
===================================================================
--- osgi-repo/trunk/stringtemplate/pom.xml	                        (rev 0)
+++ osgi-repo/trunk/stringtemplate/pom.xml	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	Copyright 2008 EscapeK
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.escapek.osgi</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>stringtemplate</artifactId>
+	<version>3.2</version>
+	<name>StringTemplate OSGi bundle</name>
+	<packaging>bundle</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>com.springsource.antlr</artifactId>
+			<version>2.7.7</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Include-Resource>@src/main/resources/stringtemplate.jar</Include-Resource>
+						<Export-Package>
+							org.antlr.stringtemplate.*
+						</Export-Package>
+						<Import-Package>
+							antlr.*;version=2.7.7,*;resolution:=optional
+						</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<pde>true</pde>
+					<projectnatures>
+						<projectnature>org.eclipse.pde.PluginNature</projectnature>
+						<projectnature>org.eclipse.jdt.core.javanature</projectnature>
+						<projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
+					</projectnatures>
+					<classpathContainers>
+						<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+						<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+						<classpathContainer>org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER</classpathContainer>
+					</classpathContainers>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file


Property changes on: osgi-repo/trunk/stringtemplate/src/main/resources/stringtemplate.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: osgi-repo/trunk/xstream.osgi/META-INF/MANIFEST.MF
===================================================================
--- osgi-repo/trunk/xstream.osgi/META-INF/MANIFEST.MF	                        (rev 0)
+++ osgi-repo/trunk/xstream.osgi/META-INF/MANIFEST.MF	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,111 @@
+Manifest-Version: 1.0
+Export-Package: com.thoughtworks.xstream.io.copy;uses:="com.thoughtwor
+ ks.xstream.io",com.thoughtworks.xstream.io.path;uses:="com.thoughtwor
+ ks.xstream.io,com.thoughtworks.xstream.converters,com.thoughtworks.xs
+ tream.io.xml,com.thoughtworks.xstream.core.util",com.thoughtworks.xst
+ ream.converters.basic;uses:="com.thoughtworks.xstream.converters,com.
+ thoughtworks.xstream.io,com.thoughtworks.xstream.mapper,com.thoughtwo
+ rks.xstream.core.util",com.thoughtworks.xstream.io.xml.xppdom;uses:="
+ org.xmlpull.v1,org.xmlpull.mxp1",com.thoughtworks.xstream;uses:="com.
+ thoughtworks.xstream.converters.basic,com.thoughtworks.xstream.core.u
+ til,com.thoughtworks.xstream.converters.extended,com.thoughtworks.xst
+ ream.converters,com.thoughtworks.xstream.io,com.thoughtworks.xstream.
+ converters.reflection,com.thoughtworks.xstream.io.xml,com.thoughtwork
+ s.xstream.mapper,com.thoughtworks.xstream.converters.collections,com.
+ thoughtworks.xstream.core,com.thoughtworks.xstream.alias",com.thought
+ works.xstream.io.json;uses:="javax.xml.stream,com.thoughtworks.xstrea
+ m.io,com.thoughtworks.xstream.io.xml,org.codehaus.jettison.mapped,com
+ .thoughtworks.xstream.core.util",com.thoughtworks.xstream.core.util;u
+ ses:="com.thoughtworks.xstream.io,com.thoughtworks.xstream.converters
+ ,com.thoughtworks.xstream.converters.reflection",com.thoughtworks.xst
+ ream.converters.javabean;uses:="com.thoughtworks.xstream.io,com.thoug
+ htworks.xstream.converters,com.thoughtworks.xstream.converters.reflec
+ tion,com.thoughtworks.xstream.mapper,com.thoughtworks.xstream.alias,c
+ om.thoughtworks.xstream.core.util",com.thoughtworks.xstream.io;uses:=
+ "com.thoughtworks.xstream.converters,com.thoughtworks.xstream,com.tho
+ ughtworks.xstream.core.util",com.thoughtworks.xstream.converters.exte
+ nded;uses:="com.thoughtworks.xstream.converters.basic,javax.security.
+ auth,com.thoughtworks.xstream.core.util,javax.xml.datatype,com.though
+ tworks.xstream.converters,com.thoughtworks.xstream.io,com.thoughtwork
+ s.xstream.converters.reflection,javax.swing,org.joda.time,org.joda.ti
+ me.format,javax.swing.plaf,com.thoughtworks.xstream.mapper,com.though
+ tworks.xstream.converters.collections",com.thoughtworks.xstream.conve
+ rters;uses:="com.thoughtworks.xstream.io,com.thoughtworks.xstream,com
+ .thoughtworks.xstream.core.util",com.thoughtworks.xstream.io.binary;u
+ ses:="com.thoughtworks.xstream.converters,com.thoughtworks.xstream.io
+ ",com.thoughtworks.xstream.converters.reflection;uses:="net.sf.cglib.
+ proxy,com.thoughtworks.xstream.converters.basic,com.thoughtworks.xstr
+ eam,com.thoughtworks.xstream.core.util,sun.reflect,com.thoughtworks.x
+ stream.io,com.thoughtworks.xstream.converters,com.thoughtworks.xstrea
+ m.mapper,com.thoughtworks.xstream.core,sun.misc",com.thoughtworks.xst
+ ream.annotations;uses:="com.thoughtworks.xstream.converters,com.thoug
+ htworks.xstream.converters.reflection,com.thoughtworks.xstream.mapper
+ ,com.thoughtworks.xstream",com.thoughtworks.xstream.io.xml;uses:="org
+ .dom4j.tree,org.dom4j,org.jdom.input,com.thoughtworks.xstream.io.xml.
+ xppdom,nu.xom,org.xmlpull.v1,org.xmlpull.mxp1,com.thoughtworks.xstrea
+ m,javax.xml.parsers,com.thoughtworks.xstream.core.util,org.w3c.dom,ja
+ vax.xml.namespace,org.xml.sax,javax.xml.stream,com.thoughtworks.xstre
+ am.converters,com.thoughtworks.xstream.io,org.dom4j.io,org.jdom,javax
+ .xml.transform.sax,org.xml.sax.helpers",com.thoughtworks.xstream.mapp
+ er;uses:="net.sf.cglib.proxy,com.thoughtworks.xstream,com.thoughtwork
+ s.xstream.core.util,com.thoughtworks.xstream.converters,com.thoughtwo
+ rks.xstream.converters.reflection,com.thoughtworks.xstream.annotation
+ s,com.thoughtworks.xstream.core,com.thoughtworks.xstream.alias,com.th
+ oughtworks.xstream.converters.enums",com.thoughtworks.xstream.persist
+ ence;uses:="com.thoughtworks.xstream.io,com.thoughtworks.xstream",com
+ .thoughtworks.xstream.converters.collections;uses:="com.thoughtworks.
+ xstream.converters,com.thoughtworks.xstream.io,com.thoughtworks.xstre
+ am.mapper,com.thoughtworks.xstream.core,com.thoughtworks.xstream.core
+ .util",com.thoughtworks.xstream.core;uses:="com.thoughtworks.xstream.
+ io.path,com.thoughtworks.xstream,com.thoughtworks.xstream.core.util,c
+ om.thoughtworks.xstream.converters,com.thoughtworks.xstream.io,com.th
+ oughtworks.xstream.converters.reflection,com.thoughtworks.xstream.io.
+ xml,com.thoughtworks.xstream.mapper,com.thoughtworks.xstream.alias",c
+ om.thoughtworks.xstream.alias;uses:="com.thoughtworks.xstream.mapper,
+ com.thoughtworks.xstream",com.thoughtworks.xstream.converters.enums;u
+ ses:="com.thoughtworks.xstream.io,com.thoughtworks.xstream.converters
+ ,com.thoughtworks.xstream.converters.basic,com.thoughtworks.xstream.m
+ apper,com.thoughtworks.xstream.converters.collections,com.thoughtwork
+ s.xstream.core.util"
+Built-By: i67i-57
+Build-Jdk: 1.6.0_05
+Bundle-Version: 0.1.0.SNAPSHOT
+Tool: Bnd-0.0.255
+Bundle-Name: XStream OSGi bundle
+Bnd-LastModified: 1213017893819
+Created-By: Apache Maven Bundle Plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.escapek.osgi.xstream.osgi
+Import-Package: com.thoughtworks.xstream;resolution:=optional,com.thou
+ ghtworks.xstream.alias;resolution:=optional,com.thoughtworks.xstream.
+ annotations;resolution:=optional,com.thoughtworks.xstream.converters;
+ resolution:=optional,com.thoughtworks.xstream.converters.basic;resolu
+ tion:=optional,com.thoughtworks.xstream.converters.collections;resolu
+ tion:=optional,com.thoughtworks.xstream.converters.enums;resolution:=
+ optional,com.thoughtworks.xstream.converters.extended;resolution:=opt
+ ional,com.thoughtworks.xstream.converters.javabean;resolution:=option
+ al,com.thoughtworks.xstream.converters.reflection;resolution:=optiona
+ l,com.thoughtworks.xstream.core;resolution:=optional,com.thoughtworks
+ .xstream.core.util;resolution:=optional,com.thoughtworks.xstream.io;r
+ esolution:=optional,com.thoughtworks.xstream.io.binary;resolution:=op
+ tional,com.thoughtworks.xstream.io.copy;resolution:=optional,com.thou
+ ghtworks.xstream.io.json;resolution:=optional,com.thoughtworks.xstrea
+ m.io.path;resolution:=optional,com.thoughtworks.xstream.io.xml;resolu
+ tion:=optional,com.thoughtworks.xstream.io.xml.xppdom;resolution:=opt
+ ional,com.thoughtworks.xstream.mapper;resolution:=optional,com.though
+ tworks.xstream.persistence;resolution:=optional,javax.security.auth;r
+ esolution:=optional,javax.swing;resolution:=optional,javax.swing.plaf
+ ;resolution:=optional,javax.xml.datatype;resolution:=optional,javax.x
+ ml.namespace;resolution:=optional,javax.xml.parsers;resolution:=optio
+ nal,javax.xml.stream;resolution:=optional,javax.xml.transform.sax;res
+ olution:=optional,net.sf.cglib.proxy;resolution:=optional,nu.xom;reso
+ lution:=optional,org.codehaus.jettison.mapped;resolution:=optional,or
+ g.dom4j;resolution:=optional,org.dom4j.io;resolution:=optional,org.do
+ m4j.tree;resolution:=optional,org.jdom;resolution:=optional,org.jdom.
+ input;resolution:=optional,org.joda.time;resolution:=optional,org.jod
+ a.time.format;resolution:=optional,org.w3c.dom;resolution:=optional,o
+ rg.xml.sax;resolution:=optional,org.xml.sax.helpers;resolution:=optio
+ nal,org.xmlpull.mxp1;resolution:=optional,org.xmlpull.v1;resolution:=
+ optional,sun.misc;resolution:=optional,sun.reflect;resolution:=option
+ al
+

Added: osgi-repo/trunk/xstream.osgi/pom.xml
===================================================================
--- osgi-repo/trunk/xstream.osgi/pom.xml	                        (rev 0)
+++ osgi-repo/trunk/xstream.osgi/pom.xml	2008-09-06 20:06:34 UTC (rev 829)
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Copyright 2008 EscapeK
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>org.escapek.osgi</groupId>
+		<artifactId>parent</artifactId>
+		<version>0.1-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>xstream</artifactId>
+	<version>1.3</version>
+	<name>XStream OSGi bundle</name>
+	<packaging>bundle</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>1.3</version>
+		</dependency>
+		<dependency>
+			<groupId>xpp3</groupId>
+			<artifactId>xpp3</artifactId>
+			<version>1.1.4c</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Export-Package>
+							com.thoughtworks.xstream*,org.xmlpull*;-split-package:=merge-last
+						</Export-Package>
+						<Import-Package>
+							*;resolution:=optional
+						</Import-Package>
+						<DynamicImport-Package>*</DynamicImport-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-eclipse-plugin</artifactId>
+				<configuration>
+					<pde>true</pde>
+					<projectnatures>
+						<projectnature>org.eclipse.pde.PluginNature</projectnature>
+						<projectnature>org.eclipse.jdt.core.javanature</projectnature>
+						<projectnature>org.maven.ide.eclipse.maven2Nature</projectnature>
+					</projectnatures>
+					<classpathContainers>
+						<classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+						<classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+						<classpathContainer>org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER</classpathContainer>
+					</classpathContainers>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[828] projectManagement/trunk/

From: <nic...@us...> - 2008-09-06 20:05:38

Revision: 828
          http://escapek.svn.sourceforge.net/escapek/?rev=828&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:05:35 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    projectManagement/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[827] projectManagement/

From: <nic...@us...> - 2008-09-06 20:05:24

Revision: 827
          http://escapek.svn.sourceforge.net/escapek/?rev=827&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:05:22 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    projectManagement/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[826] projectDesign/trunk/

From: <nic...@us...> - 2008-09-06 20:05:10

Revision: 826
          http://escapek.svn.sourceforge.net/escapek/?rev=826&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:05:08 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    projectDesign/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[825] projectDesign/

From: <nic...@us...> - 2008-09-06 20:04:58

Revision: 825
          http://escapek.svn.sourceforge.net/escapek/?rev=825&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:04:55 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    projectDesign/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[824] osgi-repo/trunk/

From: <nic...@us...> - 2008-09-06 20:04:27

Revision: 824
          http://escapek.svn.sourceforge.net/escapek/?rev=824&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:04:24 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    osgi-repo/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[823] osgi-repo/

From: <nic...@us...> - 2008-09-06 20:04:08

Revision: 823
          http://escapek.svn.sourceforge.net/escapek/?rev=823&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:04:05 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    osgi-repo/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[822] org.escapek.mofparser/trunk

From: <nic...@us...> - 2008-09-06 20:00:52

Revision: 822
          http://escapek.svn.sourceforge.net/escapek/?rev=822&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 20:00:44 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    org.escapek.mofparser/trunk/.classpath
    org.escapek.mofparser/trunk/.project
    org.escapek.mofparser/trunk/LICENSE
    org.escapek.mofparser/trunk/META-INF/
    org.escapek.mofparser/trunk/META-INF/MANIFEST.MF
    org.escapek.mofparser/trunk/build.properties
    org.escapek.mofparser/trunk/pom.xml
    org.escapek.mofparser/trunk/src/
    org.escapek.mofparser/trunk/src/assembly/
    org.escapek.mofparser/trunk/src/assembly/dependencies.xml
    org.escapek.mofparser/trunk/src/assembly/no-dependencies.xml
    org.escapek.mofparser/trunk/src/assembly/with-dependencies.xml
    org.escapek.mofparser/trunk/src/main/
    org.escapek.mofparser/trunk/src/main/antlr/
    org.escapek.mofparser/trunk/src/main/antlr/org/
    org.escapek.mofparser/trunk/src/main/antlr/org/escapek/
    org.escapek.mofparser/trunk/src/main/antlr/org/escapek/mofparser/
    org.escapek.mofparser/trunk/src/main/antlr/org/escapek/mofparser/internal/
    org.escapek.mofparser/trunk/src/main/antlr/org/escapek/mofparser/internal/cim23.g3
    org.escapek.mofparser/trunk/src/main/java/
    org.escapek.mofparser/trunk/src/main/java/org/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/CompilerDirective.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/DataType.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/FlavorType.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/IContentHandler.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/MOFParser.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/Production.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/ScopeType.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/ClassDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/InstDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/InstancePropertyDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/MethodDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/ParameterDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/PragmaDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/PropertyDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/Qualifier.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/QualifierDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/decl/TypeDecl.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/exceptions/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/exceptions/MOFParserException.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/helpers/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/helpers/DefaultHandler.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/helpers/GenerateHandler.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/helpers/LoggingHandler.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/internal/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/internal/CaseInsensitiveStringStream.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/samples/
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/samples/MOFViewer.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/samples/Sample1.java
    org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/samples/Sample2.java
    org.escapek.mofparser/trunk/src/main/resources/
    org.escapek.mofparser/trunk/src/main/resources/org/
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/classDecl.st
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/header.st
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/instDecl.st
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/pragmaDecl.st
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/qualifierDecl.st
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/internal/templates/typeDecl.st
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/samples/
    org.escapek.mofparser/trunk/src/main/resources/org/escapek/mofparser/samples/sample.mof
    org.escapek.mofparser/trunk/src/test/
    org.escapek.mofparser/trunk/src/test/java/
    org.escapek.mofparser/trunk/src/test/java/org/
    org.escapek.mofparser/trunk/src/test/java/org/escapek/
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/TestMOFParserPhaseOne.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/TestMOFParserPhaseTwo.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestClassDecl.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestInstDecl.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestInstancePropertyDecl.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestMethodDecl.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestParameterDecl.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestPropertyDecl.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestQualifier.java
    org.escapek.mofparser/trunk/src/test/java/org/escapek/mofparser/decl/TestQualifierDecl.java
    org.escapek.mofparser/trunk/src/test/resources/
    org.escapek.mofparser/trunk/src/test/resources/org/
    org.escapek.mofparser/trunk/src/test/resources/org/escapek/
    org.escapek.mofparser/trunk/src/test/resources/org/escapek/mofparser/
    org.escapek.mofparser/trunk/src/test/resources/org/escapek/mofparser/CIM_ManagedElement.mof
    org.escapek.mofparser/trunk/src/test/resources/org/escapek/mofparser/CIM_MessageLog.mof
    org.escapek.mofparser/trunk/src/test/resources/org/escapek/mofparser/CIM_StoragePool.mof
    org.escapek.mofparser/trunk/src/test/resources/org/escapek/mofparser/qualifiers.mof

Added: org.escapek.mofparser/trunk/.classpath
===================================================================
--- org.escapek.mofparser/trunk/.classpath	                        (rev 0)
+++ org.escapek.mofparser/trunk/.classpath	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="src" path="target/generated-sources/antlr"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: org.escapek.mofparser/trunk/.project
===================================================================
--- org.escapek.mofparser/trunk/.project	                        (rev 0)
+++ org.escapek.mofparser/trunk/.project	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.escapek.mofparser</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Added: org.escapek.mofparser/trunk/LICENSE
===================================================================
--- org.escapek.mofparser/trunk/LICENSE	                        (rev 0)
+++ org.escapek.mofparser/trunk/LICENSE	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2007 EscapeK
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: org.escapek.mofparser/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.mofparser/trunk/META-INF/MANIFEST.MF	                        (rev 0)
+++ org.escapek.mofparser/trunk/META-INF/MANIFEST.MF	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Mofparser
+Bundle-SymbolicName: org.escapek.mofparser
+Bundle-Version: 1.0.0.m1_SNAPSHOT
+Export-Package: org.escapek.mofparser,
+ org.escapek.mofparser.decl,
+ org.escapek.mofparser.exceptions,
+ org.escapek.mofparser.helpers
+Import-Package: antlr;version="2.7.7",
+ org.antlr.runtime;version="3.0.1",
+ org.antlr.runtime.tree;version="3.0.1",
+ org.antlr.stringtemplate,
+ org.apache.commons.logging,
+ org.eclipse.swt,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets

Added: org.escapek.mofparser/trunk/build.properties
===================================================================
--- org.escapek.mofparser/trunk/build.properties	                        (rev 0)
+++ org.escapek.mofparser/trunk/build.properties	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,23 @@
+# Copyright 2008 EscapeK
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#     
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and 
+# limitations under the License.
+# 
+# --------------------------------------------------------------------------
+# $Id$
+# --------------------------------------------------------------------------
+source.. = src/main/java/,\
+		   target/generated-sources/antlr/, \
+			samples/
+output.. = target/classes/
+version=0.3
+bin.includes = META-INF/,\
+               .

Added: org.escapek.mofparser/trunk/pom.xml
===================================================================
--- org.escapek.mofparser/trunk/pom.xml	                        (rev 0)
+++ org.escapek.mofparser/trunk/pom.xml	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	Copyright 2008 EscapeK
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+	
+	http://www.apache.org/licenses/LICENSE-2.0
+	
+	Unless required by applicable law or agreed to in writing, software
+	distributed under the License is distributed on an "AS IS" BASIS,
+	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	See the License for the specific language governing permissions and
+	limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.escapek</groupId>
+	<artifactId>mofparser</artifactId>
+	<packaging>jar</packaging>
+	<name>org.escapek.mofparser</name>
+	<url>http://wiki.escapek.org</url>
+	<version>1.0-m1-SNAPSHOT</version>
+	<description>MOF parser library</description>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<organization>
+		<name>EscapeK</name>
+		<url>http://www.escapek.org</url>
+	</organization>
+	
+	<ciManagement>
+		<system>bamboo</system>
+		<url>http://bamboo.escapek.org/browse/MPL-TRUNK</url>
+		<notifiers>
+			<notifier>
+				<type>mail</type>
+				<configuration>
+					<address>ni...@es...</address>
+				</configuration>
+			</notifier>
+		</notifiers>
+	</ciManagement>
+
+	<developers>
+		<developer>
+			<id>nico</id>
+			<name>Nicolas Jouanin</name>
+			<email>ni...@es...</email>
+			<url>http://wiki.escapek.org/display/~nico/Home</url>
+			<organization>EscapeK</organization>
+			<organizationUrl>http://www.escapek.org</organizationUrl>
+			<roles>
+				<role>architect</role>
+				<role>developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>http://jira.escapek.org/</url>
+	</issueManagement>
+	<scm>
+		<connection>
+			scm:https://svn.escapek.org/repos/org.escapek.mofparser/trunk/
+		</connection>
+		<developerConnection>
+			scm:svn:https://svn.escapek.org/escapek/org.escapek.mofparser/trunk/
+		</developerConnection>
+		<url>
+			http://fisheye.escapek.org/browse/repos/org.escapek.mofparser/trunk/
+		</url>
+	</scm>
+	<inceptionYear>2007</inceptionYear>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.antlr</groupId>
+			<artifactId>com.springsource.org.antlr</artifactId>
+			<version>3.0.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.escapek.osgi</groupId>
+			<artifactId>stringtemplate</artifactId>
+			<version>3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jcl</artifactId>
+			<version>1.5.0</version>
+		</dependency>
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt.win32.win32</groupId>
+					<artifactId>x86</artifactId>
+					<version>3.4.0.v3448f</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>unix</id>
+			<activation>
+				<os>
+					<family>unix</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt.gtk.linux</groupId>
+					<artifactId>x86</artifactId>
+					<version>3.4.0.v3448f</version>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt.carbon</groupId>
+					<artifactId>macosx</artifactId>
+					<version>3.4.0.v3448f</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<inherited>false</inherited>
+				<executions>
+					<!-- no dependencies -->
+					<execution>
+						<id>no-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>true</appendAssemblyId>
+							<descriptors>
+								<descriptor>
+									src/assembly/no-dependencies.xml
+								</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+					<!-- with dependencies -->
+					<execution>
+						<id>with-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<appendAssemblyId>true</appendAssemblyId>
+							<descriptors>
+								<descriptor>
+									src/assembly/with-dependencies.xml
+								</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>
+							META-INF/MANIFEST.MF
+						</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>pde-maven-plugin</artifactId>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>antlr3-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>antlr</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<includes>
+						<include>**/*.g3</include>
+					</includes>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<excludePackageNames>
+						*.internal
+					</excludePackageNames>
+					<quiet>true</quiet>
+					<verbose>false</verbose>
+					<source>1.5</source>
+					<links>
+						<link>
+							http://java.sun.com/j2se/1.5.0/docs/api/
+						</link>
+						<link>
+							http://www.antlr.org/api/Java/index.html
+						</link>
+					</links>
+				</configuration>
+			</plugin>
+			<!-- CheckStyle plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+			<!-- SureFire report plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+			</plugin>
+			<!-- Cobertura reporte plugin -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<configuration>
+					<instrumentation>
+						<excludes>
+							<exclude>org/escapek/mofparser/**/Test*.class</exclude>
+						</excludes>
+					</instrumentation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+	<repositories>
+		<repository>
+			<id>internal</id>
+			<name>EscapeK Managed Internal Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/internal/
+			</url>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>snapshots</id>
+			<name>EscapeK Managed Snapshot Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/snapshots/
+			</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+	<distributionManagement>
+		<downloadUrl>
+			http://wiki.escapek.org/display/MPL/Home
+		</downloadUrl>
+		<site>
+			<id>static.escapek.org</id>
+			<name>EscapeK</name>
+			<url>
+				scp://static.escapek.org:6791/var/www/static/maven/MPL/site/${version}
+			</url>
+		</site>
+		<repository>
+			<id>internal</id>
+			<name>EscapeK Managed Internal Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/internal/
+			</url>
+		</repository>
+		<snapshotRepository>
+			<id>snapshots</id>
+			<name>EscapeK Managed Snapshot Repository</name>
+			<url>
+				http://repo.escapek.org/archiva/repository/snapshots
+			</url>
+		</snapshotRepository>
+	</distributionManagement>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>atlassian-m2-repository</id>
+			<name>Atlassian Maven 2.x Repository</name>
+			<url>http://repository.atlassian.com/maven2</url>
+		</pluginRepository>
+	</pluginRepositories>
+</project>

Added: org.escapek.mofparser/trunk/src/assembly/dependencies.xml
===================================================================
--- org.escapek.mofparser/trunk/src/assembly/dependencies.xml	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/assembly/dependencies.xml	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>lib</outputDirectory>
+			<useProjectArtifact>false</useProjectArtifact>
+		</dependencySet>
+	</dependencySets>
+</component>
\ No newline at end of file

Added: org.escapek.mofparser/trunk/src/assembly/no-dependencies.xml
===================================================================
--- org.escapek.mofparser/trunk/src/assembly/no-dependencies.xml	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/assembly/no-dependencies.xml	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,29 @@
+<assembly>
+	<id>no-dependencies</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>true</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>.</directory>
+			<outputDirectory></outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<excludes>
+				<exclude>**/target/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>dist/</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<!-- docs -->
+		<fileSet>
+			<directory>target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+	</fileSets>
+</assembly>

Added: org.escapek.mofparser/trunk/src/assembly/with-dependencies.xml
===================================================================
--- org.escapek.mofparser/trunk/src/assembly/with-dependencies.xml	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/assembly/with-dependencies.xml	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,32 @@
+<assembly>
+	<id>with-dependencies</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<componentDescriptors>
+		<componentDescriptor>src/assembly/dependencies.xml</componentDescriptor>
+	</componentDescriptors>
+	<includeBaseDirectory>true</includeBaseDirectory>
+	<fileSets>
+		<fileSet>
+			<directory>.</directory>
+			<outputDirectory></outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<excludes>
+				<exclude>**/target/**</exclude>
+			</excludes>
+		</fileSet>
+		<fileSet>
+			<directory>target</directory>
+			<outputDirectory>dist/</outputDirectory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+		</fileSet>
+		<!-- docs -->
+		<fileSet>
+			<directory>target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+	</fileSets>
+</assembly>

Added: org.escapek.mofparser/trunk/src/main/antlr/org/escapek/mofparser/internal/cim23.g3
===================================================================
--- org.escapek.mofparser/trunk/src/main/antlr/org/escapek/mofparser/internal/cim23.g3	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/main/antlr/org/escapek/mofparser/internal/cim23.g3	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,421 @@
+/**
+ * Copyright 2008 EscapeK
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * 
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ *
+ * This is a complete CIM v2.3 meta-model parser, based on an ANTLR 3 grammar syntax.
+ * It makes use of the available DMTF MOF syntax grammar description, this should be LL(1) parseable
+ * Parser output is a generated AST tree which can be walked to extract data.
+ * 
+ * Token and literrals rules MUST be written in lowercase in this grammar. Streams parsed by this
+ * grammar must be read by a case insensitive String stream.
+ * 
+ */
+grammar cim23;
+
+options {
+	output=AST;
+ 	ASTLabelType=CommonTree;
+  }
+
+tokens {
+	CLASS		=	'class';
+	PRAGMA		=	'#pragma';
+	QUALIFIER	=	'qualifier';
+	SCOPE		=	'scope';
+	FLAVOR		=	'flavor';
+	ASSOCIATION	= 	'association';
+	INDICATION	= 	'indication';
+	PROPERTY	= 	'property';
+	SCHEMA		= 	'schema';
+	Type;
+	Array;
+	Qualifiers;
+	SuperClass;
+	Class;
+	Property;
+	Reference;
+	Object;
+	Method;
+	Returns;
+	Parameter;
+	Default;
+	Instance;
+	Alias;
+	Value;
+	CompilerDirective;
+}
+
+@header {
+package org.escapek.mofparser.internal;
+
+import java.lang.String;
+}
+@lexer::header {
+package org.escapek.mofparser.internal;
+}
+
+mofSpecification
+	:	mofProduction+			
+	;
+
+mofProduction
+	:	compilerDirective| 
+		classDeclaration |
+		qualifierDeclaration |
+		instanceDeclaration
+	;
+
+compilerDirective
+	:	PRAGMA pragmaName '(' pragmaParameter ')' -> ^(CompilerDirective pragmaName pragmaParameter)
+	;
+		
+	
+pragmaName
+	:	 IDENTIFIER
+	;
+
+pragmaParameter
+	:	STRING_VALUE
+	;
+
+classDeclaration
+	:	(qualifierList)?
+		CLASS className (scl=superClass)?
+		'{' classFeature* '}' ';'
+		-> ^(Class ^(className ^(SuperClass $scl)? (qualifierList)?  ^(classFeature)*))
+	;
+
+className
+	:	IDENTIFIER
+	;
+
+alias	:	AS aliasIdentifier -> aliasIdentifier
+	;
+	
+aliasIdentifier
+	:	'$' IDENTIFIER  -> IDENTIFIER // NO whitespace !
+	;
+
+superClass
+	:	':' className -> className
+	;
+
+classFeature
+	:	propertyDeclaration | methodDeclaration | referenceDeclaration
+	;
+
+qualifierList
+	:	'[' qualifier ( ',' qualifier )* ']' -> ^(Qualifiers qualifier+)
+	;	
+	
+qualifier
+	:	qualifierName (qualifierParameter)? (':' flavor+)?
+		-> ^(qualifierName qualifierParameter? (flavor+)?)
+	;
+
+qualifierName 
+	:	IDENTIFIER | ASSOCIATION | INDICATION | SCHEMA
+		//Identifier + Meta qualifiers name
+	;
+
+qualifierParameter
+	:	'(' constantValue ')' -> constantValue 
+		| arrayInitializer -> arrayInitializer
+	;
+
+flavor
+	:	( ENABLEOVERRIDE
+		| DISABLEOVERRIDE
+		| RESTRICTED
+		| TOSUBCLASS
+		| TRANSLATABLE
+		)
+	;
+
+propertyDeclaration
+	:	(qualifierList)? dataType propertyName
+		(array)? (defaultValue)? ';'
+		-> ^(Property propertyName ^(Type ^(dataType array? )) ^(Default defaultValue?) qualifierList?)
+	;
+
+referenceDeclaration 
+	:	(qualifierList)? objectRef referenceName (defaultValue)? ';'
+		-> ^(Property referenceName ^(Type ^(Reference objectRef ))  ^(Default defaultValue?) qualifierList?)
+	;
+
+methodDeclaration
+	:	(qualifierList)? dataType methodName '(' parameterList? ')' ';'
+		-> ^(Method methodName ^(Returns dataType) parameterList? qualifierList?)
+	;
+	
+propertyName
+	:	IDENTIFIER
+	;
+
+referenceName
+	:	IDENTIFIER
+	;
+
+methodName
+	:	IDENTIFIER
+	;
+
+dataType:	(DT_UINT8 | DT_SINT8 | DT_UINT16 | DT_SINT16 |
+		DT_UINT32 | DT_SINT32 | DT_UINT64 | DT_SINT64 |
+		DT_REAL32 | DT_REAL64 | DT_CHAR16 |
+		DT_STR | DT_BOOL | DT_DATETIME)
+	;
+
+objectRef
+	:	className REF -> className
+	;
+	
+parameterList
+	:	parameter ( ',' parameter )* -> parameter+
+	;
+
+parameter
+	:	(qualifierList)? dataType parameterName (array)?
+			-> ^(Parameter parameterName ^(Type ^(dataType array?)) qualifierList?)
+		| 
+		(qualifierList)? objectRef parameterName (array)?
+			-> ^(Parameter parameterName ^(Type ^(Reference objectRef )) qualifierList?)
+	;
+
+parameterName
+	:	IDENTIFIER
+	;
+
+array	:	'[' (positiveDecimalValue)? ']' -> ^(Array positiveDecimalValue?)
+	;
+	
+positiveDecimalValue
+	:	DECIMAL_DIGIT+
+	;
+	
+defaultValue
+	:	'=' initializer -> initializer
+	;
+
+initializer
+	:	constantValue | arrayInitializer | referenceInitializer
+	;
+	
+arrayInitializer
+	:	'{' constantValue ( ',' constantValue)* '}' ->constantValue+
+	;
+	
+constantValue
+	:	integerValue
+		|  multi_line_string 
+		| real_value | CHAR_VALUE | 
+		boolean_value | NULL_VALUE
+	;
+
+boolean_value
+	:	TRUE | FALSE
+	;
+	
+integerValue
+	:	BINARY_VALUE | OCTAL_VALUE | DECIMAL_VALUE | HEX_VALUE
+	;
+	
+referenceInitializer
+	:	objectHandle | aliasIdentifier
+	;
+	
+objectHandle
+	:	'"' objectName '"'
+	;
+
+objectName
+	:	(namespacePath ':')? modelPath
+	;
+	
+namespacePath
+	:	(namespaceType '://')? namespaceHandle
+	;
+
+namespaceType
+	:	CHAR_VALUE+
+	;
+
+namespaceHandle
+	:	CHAR_VALUE+
+	;
+
+modelPath
+	:	className '.' keyValuePairList
+	;
+
+keyValuePairList
+	:	keyValuePair ( ',' keyValuePair )*
+	;
+
+keyValuePair
+	:	( propertyName '=' constantValue ) | ( referenceName '=' objectHandle )
+	;
+	
+qualifierDeclaration
+	:	QUALIFIER qualifierName qualifierType qualifierScope defaultFlavor? ';'
+		-> ^(QUALIFIER qualifierName qualifierType qualifierScope defaultFlavor?)
+	;
+	
+qualifierType
+	:	':' dataType (array)? (defaultValue)? -> ^(Type ^(dataType array? ) ^(Default defaultValue?))
+	;
+
+qualifierScope	:	',' SCOPE '(' metaElement ( ',' metaElement )* ')'
+	-> ^(SCOPE ^(metaElement)+) 
+;
+
+metaElement
+	:	CLASS | ASSOCIATION | INDICATION | QUALIFIER | 
+		PROPERTY | REFERENCE | METHOD | PARAMETER | ANY
+	;
+
+defaultFlavor
+	:	',' FLAVOR '(' flavor ( ',' flavor )* ')'
+		-> ^(FLAVOR ^(flavor)+) 
+	;
+
+instanceDeclaration
+	:	(qualifierList)? INSTANCE OF className alias?
+		'{' valueInitializer+ '}' ';'
+		-> ^(Instance ^(className ^(Alias alias)? (qualifierList)?  ^(Property valueInitializer)+))
+	;
+	
+valueInitializer
+	:	(qualifierList)? initializerName '=' initializer ';'
+		-> ^(initializerName (qualifierList)?) ^(Value initializer)
+	;
+	
+initializerName
+	:	IDENTIFIER
+	;
+		
+fileName:	STRING_VALUE
+	;
+
+multi_line_string
+	:	(STRING_VALUE)*
+	;
+
+BINARY_VALUE
+	:	
+		('+' | '-')? ('0'|'1')+ ( 'b' | 'B' )
+	;
+
+HEX_VALUE:	('+' | '-')? ( '0x' | '0X' ) ('0'..'9' | 'a'..'f' | 'A'..'F')+
+	;
+
+DECIMAL_VALUE
+	:	('+' | '-')? ('0'..'9')+ 
+	;
+
+OCTAL_VALUE
+	:	('+' | '-')? '0' ('0'|'1'|'2'|'3'|'4'|'5'|'6'|'7')+
+	;
+
+real_value
+	:	('+' | '-') DECIMAL_DIGIT* '.' DECIMAL_DIGIT+
+		( ('e' | 'E') ( '+' | '-')? DECIMAL_DIGIT+)?
+	;
+		
+
+WS      : (' '|'\t')+ {$channel=HIDDEN;}
+	;
+EOL	: '\r'? '\n' {$channel=HIDDEN;}
+	;
+SL_COMMENT
+    :   '//' ~('\n'|'\r')* EOL {$channel=HIDDEN;}
+    ;
+
+ML_COMMENT
+    :   '/*' ( options {greedy=false;} : . )* '*/' {$channel=HIDDEN;}
+    ;
+    
+
+ANY			:	'any';
+AS			:	'as';
+DISABLEOVERRIDE 
+			:		'disableoverride';
+DT_BOOL		:	'boolean';
+DT_CHAR16	:	'char16';
+DT_DATETIME	:	'datetime';
+DT_REAL32	:	'real32';
+DT_REAL64	:	'real64';
+DT_SINT16	:	'sint16';
+DT_SINT32	:	'sint32';
+DT_SINT64	:	'sint64';
+DT_SINT8	:	'sint8';
+DT_STR		:	'string';
+DT_UINT16	:	'uint16';
+DT_UINT32	:	'uint32';
+DT_UINT64	:	'uint64';
+DT_UINT8	:	'uint8';
+ENABLEOVERRIDE	:	'enableoverride';
+FALSE		:	'false';
+INSTANCE	:	'instance';
+METHOD		:	'method';
+NULL_VALUE	:	'null';
+OF			:	'of';
+PARAMETER	:	'parameter';
+REF			:	'ref';
+REFERENCE	:	'reference';
+RESTRICTED	:	'restricted';
+SCHEMA		:	'schema';
+TOSUBCLASS	:	'tosubclass';
+TRANSLATABLE:	'translatable';
+TRUE		:	'true';
+
+fragment
+DECIMAL_DIGIT
+	:	('0'..'9');
+		
+CHAR_VALUE
+	:	'"' (ESC | ~('\\'|'"')) '"'
+	;
+	
+STRING_CHAR
+	:	 ('\u0001'..'\uFFEF') | ESC
+	;
+
+STRING_VALUE
+	:	('"' ( options { greedy = false; } : STRING_CHAR )* '"')+;
+
+ESC	
+	:	'\\'
+		( 'n'
+		| 't'
+		| 'v'   	
+		| 'b'
+		| 'r'
+		| 'f'
+		| 'a'  	
+		| '\\'
+		| '?'
+		| '\''
+		| '"'
+		| ('0' | '1' | '2' | '3') ('0'..'7')?
+		| 'x' ('0'..'9' | 'a'..'f' | 'A'..'F')?
+		)
+	;
+
+IDENTIFIER	:	( '\u0041'..'\u005A'|'\u0061'..'\u007A' )
+			( '\u005F'|'\u0030'..'\u0039'|'\u0041'..'\u005A'|'\u0061'..'\u007A' )*
+	 ; 

Added: org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/CompilerDirective.java
===================================================================
--- org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/CompilerDirective.java	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/CompilerDirective.java	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2008 EscapeK
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * 
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.mofparser;
+
+/**
+ * Enumerates supported compiler directives. See <a href="http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf">
+ * CIM specifications</a> for details.
+ * @author nico
+ *
+ */
+public enum CompilerDirective {
+	include,
+	instancelocale,
+	locale,
+	namespace;
+}

Added: org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/DataType.java
===================================================================
--- org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/DataType.java	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/DataType.java	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2008 EscapeK
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * 
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.mofparser;
+
+/**
+ * Enumerates supported data types. See <a href="http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf">
+ * CIM specifications</a> for details.
+ * @author nico
+ *
+ */
+public enum DataType {
+	UINT8,
+	SINT8,
+	UINT16,
+	SINT16,
+	UINT32,
+	SINT32,
+	UINT64,
+	SINT64,
+	STRING,
+	BOOLEAN,
+	REAL32,
+	REAL64,
+	DATETIME,
+	REFERENCE,
+	CHAR16;
+}

Added: org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/FlavorType.java
===================================================================
--- org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/FlavorType.java	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/FlavorType.java	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,53 @@
+/**
+ * Copyright 2008 EscapeK
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * 
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.mofparser;
+
+/**
+ * Enumerates supported flavors. See <a href="http://www.dmtf.org/standards/published_documents/DSP0004V2.3_final.pdf">
+ * CIM specifications</a> for details.
+ * @author nico
+ *
+ */
+public enum FlavorType {
+	/**
+	 * this qualifier is overridable
+	 */
+	ENABLEOVERRIDE,
+
+	/**
+	 * this qualifier cannot be overridden
+	 */
+	DISABLEOVERRIDE,
+
+	/**
+	 * this qualifier applies only to the class in which it is declared
+	 */
+	RESTRICTED,
+
+	/**
+	 * this qualifier is inherited by any subclass
+	 */
+	TOSUBCLASS,
+	
+	/**
+	 * this qualifier can be specified in multiple locales (language and country
+	 * combination).
+	 */
+	TRANSLATE;
+}

Added: org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/IContentHandler.java
===================================================================
--- org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/IContentHandler.java	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/IContentHandler.java	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,135 @@
+/**
+ * Copyright 2008 EscapeK
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * 
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.mofparser;
+
+import org.escapek.mofparser.decl.ClassDecl;
+import org.escapek.mofparser.decl.InstDecl;
+import org.escapek.mofparser.decl.PragmaDecl;
+import org.escapek.mofparser.decl.QualifierDecl;
+import org.escapek.mofparser.exceptions.MOFParserException;
+
+/**
+ * Interface defining methods that must be implemented by a mof parse events.
+ * These methods are called by MOFParser when it parses MOF declaration.
+ * @author nico
+ *
+ */
+public interface IContentHandler {
+	/**
+	 * Receive notification of the beginning of MOF document parsing
+	 */
+	public void startDocument() throws MOFParserException;
+
+	/**
+	 * Receive notification of the end of MOF document parsing
+	 */
+	public void endDocument() throws MOFParserException;
+	
+	/**
+	 * Receive notification of a parse error. This method is responsible
+	 * of managing the exception, and eventually throw it back.
+	 * @param ex exception thrown by the parser
+	 * @throws MOFParserException new exception thrown if needed.
+	 */
+	public void error(MOFParserException ex) throws MOFParserException;
+
+	/**
+	 * Receive notification of the beginning of a production parsing
+	 * @param productionType production type being parsed
+	 */
+	public void startProduction(Production productionType) throws MOFParserException;
+
+	/**
+	 * Receive notification of the end of a production parsing.
+	 */
+	public void endProduction() throws MOFParserException;
+	
+	/**
+	 * Receive notification of the beginning of a compiler directive parsing
+	 */
+	public void startCompilerDirective() throws MOFParserException;
+	
+	/**
+	 * Receive data of a successfully parsed compiler directive.
+	 * @param decl compiler directive parsed
+	 */
+	public void compilerDirective(PragmaDecl decl) throws MOFParserException;
+	
+	/**
+	 * Receive notification of the end of a compiler directive parsing.
+	 * This method can be used to clean space after processing the compiler directive received.
+	 */
+	public void endCompilerDirective() throws MOFParserException;
+	
+	/**
+	 * Receive notification of the beginning of a qualifier declaration parsing
+	 */
+	public void startQualifierDeclaration() throws MOFParserException;
+	
+	/**
+	 * Receive data of a successfully parsed qualifier declaration.
+	 * @param decl qualifier declaration parsed
+	 */
+	public void qualifierDeclaration(QualifierDecl decl) throws MOFParserException;
+	
+	/**
+	 * Receive notification of the end of a qualifier declaration parsing.
+	 * This method can be used to clean space after processing the qualifier declaration received.
+	 */
+	public void endQualifierDeclaration() throws MOFParserException;
+
+	/**
+	 * Receive notification of the beginning of a class declaration parsing
+	 */
+	public void startClassDeclaration() throws MOFParserException;
+
+	/**
+	 * Receive data of a successfully parsed class declaration.
+	 * @param decl class declaration parsed
+	 */
+	public void classDeclaration(ClassDecl decl) throws MOFParserException;
+
+	/**
+	 * Receive notification of the end of a class declaration parsing.
+	 * This method can be used to clean space after processing the class declaration received.
+	 */
+	public void endClassDeclaration() throws MOFParserException;
+
+	/**
+	 * Receive notification of the beginning of MOF document parsing
+	 */
+	public void include(String name);
+
+	/**
+	 * Receive notification of the beginning of an instance declaration parsing
+	 */
+	public void startInstanceDeclaration() throws MOFParserException;
+
+	/**
+	 * Receive data of a successfully parsed instance declaration.
+	 * @param decl instance declaration parsed
+	 */
+	public void instanceDeclaration(InstDecl decl) throws MOFParserException;
+
+	/**
+	 * Receive notification of the end of an instance declaration parsing.
+	 * This method can be used to clean space after processing the instance declaration received.
+	 */
+	public void endInstanceDeclaration() throws MOFParserException;
+}

Added: org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/MOFParser.java
===================================================================
--- org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/MOFParser.java	                        (rev 0)
+++ org.escapek.mofparser/trunk/src/main/java/org/escapek/mofparser/MOFParser.java	2008-09-06 20:00:44 UTC (rev 822)
@@ -0,0 +1,816 @@
+/**
+ * Copyright 2008 EscapeK
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *     
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ * 
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.mofparser;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.stringtemplate.StringTemplate;
+import org.antlr.stringtemplate.StringTemplateGroup;
+import org.escapek.mofparser.decl.ClassDecl;
+import org.escapek.mofparser.decl.InstDecl;
+import org.escapek.mofparser.decl.InstancePropertyDecl;
+import org.escapek.mofparser.decl.MethodDecl;
+import org.escapek.mofparser.decl.ParameterDecl;
+import org.escapek.mofparser.decl.PragmaDecl;
+import org.escapek.mofparser.decl.PropertyDecl;
+import org.escapek.mofparser.decl.Qualifier;
+import org.escapek.mofparser.decl.QualifierDecl;
+import org.escapek.mofparser.decl.TypeDecl;
+import org.escapek.mofparser.exceptions.MOFParserException;
+import org.escapek.mofparser.internal.CaseInsensitiveStringStream;
+import org.escapek.mofparser.internal.cim23Lexer;
+import org.escapek.mofparser.internal.cim23Parser;
+
+
+/**
+ * MOFParser provides methods for parsing a input stream containing a MOF syntax production.
+ * Parsing is based on a callback system. Once the parser has been initialized, parsin is ran
+ * by passing the parser an event handler instance. Event handler methods will be automatically
+ * called by the parser when it detects some MOF language specification, so the handler can easily
+ * manage the data. 
+ * MOFParser also provides some basic checks on MOF syntax which can be intercepted by the handler.
+ * @author nico
+ *
+ */
+public class MOFParser {
+	private static String PRAGMA_DECL 		= "CompilerDirective";
+	private static String QUALIFIER_DECL 	= "qualifier";
+	private static String CLASS_DECL 		= "class";
+	private static String INSTANCE_DECL 	= "instance";
+	private static String TYPE				= "Type";
+	private static String METHOD 			= "Method";
+	private static String SCOPE				= "Scope";
+	private static String FLAVOR			= "Flavor";
+	private static String DEFAULT			= "Default";
+	private static String QUALIFIERS		= "Qualifiers";
+	private static String SUPERCLASS		= "SuperClass";
+	private static String PROPERTY			= "Property";
+	private static String PARAMETER			= "Parameter";
+	private static String ALIAS				= "Alias";
+	private static String VALUE				= "Value";
+	private static String RETURNS			= "Returns";
+
+	
+	private cim23Lexer lexer;
+	
+	/**
+	 * Default constructor. 
+	 * CIM 2.3 lexer is initialized by this constructor.
+	 */
+	public MOFParser() {
+		 lexer = new cim23Lexer();
+	}
+	
+	/**
+	 * <p>Parse a MOF specification read from an InputStream.</p>
+	 * <p>Parsing events are sent to the given handler instance.</p>
+	 * @param iStream stream containing MOF specification to read. This stream can come from a file, a socket or whatever.
+	 * @param handler instance of the handler which will receive parsing events.
+	 * @throws MOFParserException thrown if an error is detected during parse.
+	 * @throws IOException if an error occurs while reading the stream
+	 */
+	public void parse(InputStream iStream, IContentHandler handler) throws MOFParserException, IOException {
+		OutputStream out = new ByteArrayOutputStream();
+		byte[] buf = new byte[1024];
+		int numRead=0;
+        while((numRead=iStream.read(buf)) != -1){
+        	out.write(buf, 0, numRead);
+        }
+		
+		parse(out.toString(), handler);
+	}
+
+	/**
+	 * <p>Parse a MOF specification read from an InputStream.</p>
+	 * <p>Parsing events are sent to the given handler instance.</p>
+	 * @param mofContent String containing a MOF specification.
+	 * @param handler instance of the handler which will receive parsing events.
+	 * @throws MOFParserException thrown if an error is detected during parse.
+	 */
+	public void parse(String mofContent, IContentHandler handler) throws MOFParserException {
+		handler.startDocument();
+		lexer.setCharStream(new CaseInsensitiveStringStream(mofContent));
+	   	CommonTokenStream tokens = new CommonTokenStream(lexer);
+	    cim23Parser parser = new cim23Parser(tokens);
+	    
+		CommonTree specTree;
+	    try {
+			specTree = (CommonTree)parser.mofSpecification().getTree();
+			//MPL-17
+			//Test 'nil' to know is only one production has been parsed
+			if(specTree.toString().equalsIgnoreCase("nil"...
 
[truncated message content]

[Escapek-commits] SF.net SVN: escapek:[821] org.escapek.mofparser/trunk/

From: <nic...@us...> - 2008-09-06 19:59:00

Revision: 821
          http://escapek.svn.sourceforge.net/escapek/?rev=821&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 19:58:58 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    org.escapek.mofparser/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[820] org.escapek.mofparser/

From: <nic...@us...> - 2008-09-06 19:58:46

Revision: 820
          http://escapek.svn.sourceforge.net/escapek/?rev=820&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 19:58:44 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    org.escapek.mofparser/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[819] escapek-modules/trunk

From: <nic...@us...> - 2008-09-06 19:15:14

Revision: 819
          http://escapek.svn.sourceforge.net/escapek/?rev=819&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 19:13:58 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    escapek-modules/trunk/.classpath
    escapek-modules/trunk/.project
    escapek-modules/trunk/core/
    escapek-modules/trunk/core/.classpath
    escapek-modules/trunk/core/.project
    escapek-modules/trunk/core/.settings/
    escapek-modules/trunk/core/.settings/org.maven.ide.eclipse.prefs
    escapek-modules/trunk/core/META-INF/
    escapek-modules/trunk/core/META-INF/MANIFEST.MF
    escapek-modules/trunk/core/META-INF/spring/
    escapek-modules/trunk/core/META-INF/spring/bundle-context-osgi.xml
    escapek-modules/trunk/core/META-INF/spring/bundle-context.xml
    escapek-modules/trunk/core/build.properties
    escapek-modules/trunk/core/build.xml
    escapek-modules/trunk/core/pom.xml
    escapek-modules/trunk/core/resources/
    escapek-modules/trunk/core/src/
    escapek-modules/trunk/core/src/main/
    escapek-modules/trunk/core/src/main/java/
    escapek-modules/trunk/core/src/main/java/org/
    escapek-modules/trunk/core/src/main/java/org/escapek/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/EventLevel.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/event/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/event/Event.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/event/EventPriority.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/event/IEventListener.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/event/IEventPublisher.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/Activator.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/event/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/event/EventLoggingListener.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/event/EventPublisherService.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/nls/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/nls/ExceptionsMessages.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/internal/nls/ExceptionsMessages.properties
    escapek-modules/trunk/core/src/main/java/org/escapek/core/tools/
    escapek-modules/trunk/core/src/main/java/org/escapek/core/tools/MiscTools.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/tools/OsgiTools.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/tools/SecurityTools.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/tools/StringUtil.java
    escapek-modules/trunk/core/src/main/java/org/escapek/core/tools/SysTools.java
    escapek-modules/trunk/domain/
    escapek-modules/trunk/domain/.classpath
    escapek-modules/trunk/domain/.project
    escapek-modules/trunk/domain/.settings/
    escapek-modules/trunk/domain/.settings/org.maven.ide.eclipse.prefs
    escapek-modules/trunk/domain/META-INF/
    escapek-modules/trunk/domain/META-INF/MANIFEST.MF
    escapek-modules/trunk/domain/build.properties
    escapek-modules/trunk/domain/pom.xml
    escapek-modules/trunk/domain/src/
    escapek-modules/trunk/domain/src/main/
    escapek-modules/trunk/domain/src/main/java/
    escapek-modules/trunk/domain/src/main/java/org/
    escapek-modules/trunk/domain/src/main/java/org/escapek/
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/Comment.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/MOFCompilationReport.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/Node.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMArgument.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMClass.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMDataType.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMElement.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMFlavor.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMInstance.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMMethod.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMModel.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMNameSpace.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMObject.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMParameter.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMProperty.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMPropertyInstance.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMQualifiedElement.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMQualifier.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMQualifierType.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMSchema.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMScope.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/CIMValue.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/DataType.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/DateTime.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/FlavorType.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/ScopeType.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/StringUtil.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/UInt.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/UInt16.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/UInt32.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/UInt64.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/cim/UInt8.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/internal/
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/internal/Activator.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/internal/PermissionFormattingTools.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/internal/PermissionTools.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/registry/
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/registry/RegistryNode.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/registry/RegistryNodeData.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/NodeACL.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/NodeACLPermission.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/Permission.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/Privilege.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/RepositoryKey.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/Role.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/RoleNodeACLPermission.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/RolePrivilege.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/Ticket.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/TicketData.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/User.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/UserNodeACLPermission.java
    escapek-modules/trunk/domain/src/main/java/org/escapek/domain/security/UserPrivilege.java
    escapek-modules/trunk/domain-orm/
    escapek-modules/trunk/domain-orm/.classpath
    escapek-modules/trunk/domain-orm/.project
    escapek-modules/trunk/domain-orm/.settings/
    escapek-modules/trunk/domain-orm/META-INF/
    escapek-modules/trunk/domain-orm/META-INF/MANIFEST.MF
    escapek-modules/trunk/domain-orm/build.properties
    escapek-modules/trunk/domain-orm/pom.xml
    escapek-modules/trunk/domain-orm/src/
    escapek-modules/trunk/domain-orm/src/main/
    escapek-modules/trunk/domain-orm/src/main/java/
    escapek-modules/trunk/domain-orm/src/main/java/org/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/deployer/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/FinderExecutor.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/IGenericDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/IMOFCompilationReportDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/IRegistryNodeDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMArgumentDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMClassDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMDataTypeDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMElementDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMFlavorDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMInstanceDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMMethodDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMModelDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMNameSpaceDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMObjectDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMParameterDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMPropertyDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMPropertyInstanceDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMQualifiedElementDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMQualifierDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMQualifierTypeDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMSchemaDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMScopeDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/cim/ICIMValueDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/INodeACLDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/INodeACLPermission.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/IRoleDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/IRoleNodeACLPermissionDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/ITicketDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/IUserDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/dao/security/IUserNodeACLPermissionDao.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/internal/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/internal/Activator.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/internal/dao/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/internal/dao/aop/
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/internal/dao/aop/NodeDaoAdvice.java
    escapek-modules/trunk/domain-orm/src/main/java/org/escapek/domain/orm/internal/dao/aop/RegistryNodeDaoAdvice.java
    escapek-modules/trunk/domain-orm-hibernate/
    escapek-modules/trunk/domain-orm-hibernate/.classpath
    escapek-modules/trunk/domain-orm-hibernate/.project
    escapek-modules/trunk/domain-orm-hibernate/.settings/
    escapek-modules/trunk/domain-orm-hibernate/META-INF/
    escapek-modules/trunk/domain-orm-hibernate/META-INF/MANIFEST.MF
    escapek-modules/trunk/domain-orm-hibernate/META-INF/config/
    escapek-modules/trunk/domain-orm-hibernate/META-INF/config/cim-mapping.hbm.xml
    escapek-modules/trunk/domain-orm-hibernate/META-INF/config/model-mapping.hbm.xml
    escapek-modules/trunk/domain-orm-hibernate/META-INF/spring/
    escapek-modules/trunk/domain-orm-hibernate/META-INF/spring/cim-domain.xml
    escapek-modules/trunk/domain-orm-hibernate/META-INF/spring/cim-services.xml
    escapek-modules/trunk/domain-orm-hibernate/META-INF/spring/datasource.xml
    escapek-modules/trunk/domain-orm-hibernate/META-INF/spring/domain.xml
    escapek-modules/trunk/domain-orm-hibernate/META-INF/spring/services.xml
    escapek-modules/trunk/domain-orm-hibernate/build.properties
    escapek-modules/trunk/domain-orm-hibernate/hibernate.properties
    escapek-modules/trunk/domain-orm-hibernate/pom.xml
    escapek-modules/trunk/domain-orm-hibernate/src/
    escapek-modules/trunk/domain-orm-hibernate/src/main/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/Activator.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/FinderIntroductionAdvisor.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/FinderIntroductionInterceptor.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/GenericDao.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/GenericEnumUserType.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/NodeEventListener.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/PermissionUserType.java
    escapek-modules/trunk/domain-orm-hibernate/src/main/java/org/escapek/domain/orm/hibernate/internal/dao/XStreamType.java
    escapek-modules/trunk/domain-orm-hibernate-h2/
    escapek-modules/trunk/domain-orm-hibernate-h2/.classpath
    escapek-modules/trunk/domain-orm-hibernate-h2/.project
    escapek-modules/trunk/domain-orm-hibernate-h2/.settings/
    escapek-modules/trunk/domain-orm-hibernate-h2/.settings/org.eclipse.jdt.core.prefs
    escapek-modules/trunk/domain-orm-hibernate-h2/META-INF/
    escapek-modules/trunk/domain-orm-hibernate-h2/META-INF/MANIFEST.MF
    escapek-modules/trunk/domain-orm-hibernate-h2/META-INF/spring/
    escapek-modules/trunk/domain-orm-hibernate-h2/META-INF/spring/jdbc.properties
    escapek-modules/trunk/domain-orm-hibernate-h2/pom.xml
    escapek-modules/trunk/domain-orm-hibernate-oracle/
    escapek-modules/trunk/domain-orm-hibernate-oracle/.classpath
    escapek-modules/trunk/domain-orm-hibernate-oracle/.project
    escapek-modules/trunk/domain-orm-hibernate-oracle/.settings/
    escapek-modules/trunk/domain-orm-hibernate-oracle/.settings/org.eclipse.pde.core.prefs
    escapek-modules/trunk/domain-orm-hibernate-oracle/META-INF/
    escapek-modules/trunk/domain-orm-hibernate-oracle/META-INF/MANIFEST.MF
    escapek-modules/trunk/domain-orm-hibernate-oracle/META-INF/spring/
    escapek-modules/trunk/domain-orm-hibernate-oracle/META-INF/spring/jdbc.properties
    escapek-modules/trunk/domain-orm-hibernate-oracle/build.properties
    escapek-modules/trunk/domain-orm-hibernate-oracle/pom.xml
    escapek-modules/trunk/gui/
    escapek-modules/trunk/gui/.classpath
    escapek-modules/trunk/gui/.project
    escapek-modules/trunk/gui/.settings/
    escapek-modules/trunk/gui/META-INF/
    escapek-modules/trunk/gui/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui/build.properties
    escapek-modules/trunk/gui/escapek.product
    escapek-modules/trunk/gui/plugin.properties
    escapek-modules/trunk/gui/plugin.xml
    escapek-modules/trunk/gui/pom.xml
    escapek-modules/trunk/gui/resources/
    escapek-modules/trunk/gui/resources/icons/
    escapek-modules/trunk/gui/resources/icons/manage_rep.png
    escapek-modules/trunk/gui/resources/icons/repository.gif
    escapek-modules/trunk/gui/resources/icons/repository.png
    escapek-modules/trunk/gui/resources/icons/repository_connection.png
    escapek-modules/trunk/gui/resources/icons/server.gif
    escapek-modules/trunk/gui/splash.bmp
    escapek-modules/trunk/gui/src/
    escapek-modules/trunk/gui/src/main/
    escapek-modules/trunk/gui/src/main/java/
    escapek-modules/trunk/gui/src/main/java/org/
    escapek-modules/trunk/gui/src/main/java/org/escapek/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/Application.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ApplicationActionBarAdvisor.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ApplicationWorkbenchAdvisor.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ApplicationWorkbenchWindowAdvisor.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ClientPlugin.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/CommonUIMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/CommonUIMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/DialogMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/DialogMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/ErrorMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/ErrorMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/InitJobMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/InitJobMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/LoadFilesJobMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/LoadFilesJobMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/RegistryJobMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/RegistryJobMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/RegistryMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/RegistryMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/ServiceTesterMessages.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/internal/nls/ServiceTesterMessages.properties
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/intro/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/perspectives/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/perspectives/Perspective.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/actions/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/actions/ManageRepositoriesAction.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/dialogs/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/dialogs/EditRepositoryDialog.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/dialogs/ManageRepositoriesDialog.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/dialogs/providers/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/dialogs/providers/RepositoriesTableContentProvider.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/dialogs/providers/RepositoriesTableLabelProvider.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/EscapeKDialog.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/EscapeKWizard.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/ServiceTester.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/repository/
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/repository/RegistryTreeContentProvider.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/repository/RegistryTreeLabelProvider.java
    escapek-modules/trunk/gui/src/main/java/org/escapek/gui/ui/tools/repository/RegistryTreeViewer.java
    escapek-modules/trunk/gui-core/
    escapek-modules/trunk/gui-core/.classpath
    escapek-modules/trunk/gui-core/.project
    escapek-modules/trunk/gui-core/.settings/
    escapek-modules/trunk/gui-core/META-INF/
    escapek-modules/trunk/gui-core/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-core/build.properties
    escapek-modules/trunk/gui-core/plugin.xml
    escapek-modules/trunk/gui-core/pom.xml
    escapek-modules/trunk/gui-core/src/
    escapek-modules/trunk/gui-core/src/main/
    escapek-modules/trunk/gui-core/src/main/java/
    escapek-modules/trunk/gui-core/src/main/java/org/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/EscapeKJob.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/internal/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/internal/Activator.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/internal/ObjectChangeService.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/objectChange/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/objectChange/IObjectChangeListener.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/objectChange/IObjectChangeService.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/objectChange/IRefreshListener.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/objectChange/ObjectChangeEvent.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/objectChange/ObjectChangeJob.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/utils/
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/utils/ApplicationTools.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/utils/ConfiguratorUtils.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/utils/RegistryTools.java
    escapek-modules/trunk/gui-core/src/main/java/org/escapek/gui/core/utils/ServiceUtils.java
    escapek-modules/trunk/gui-core/src/main/resources/
    escapek-modules/trunk/gui-core/src/test/
    escapek-modules/trunk/gui-core/src/test/java/
    escapek-modules/trunk/gui-core/src/test/resources/
    escapek-modules/trunk/gui-core-ui/
    escapek-modules/trunk/gui-core-ui/.classpath
    escapek-modules/trunk/gui-core-ui/.project
    escapek-modules/trunk/gui-core-ui/.settings/
    escapek-modules/trunk/gui-core-ui/META-INF/
    escapek-modules/trunk/gui-core-ui/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-core-ui/build.properties
    escapek-modules/trunk/gui-core-ui/plugin.properties
    escapek-modules/trunk/gui-core-ui/plugin.xml
    escapek-modules/trunk/gui-core-ui/pom.xml
    escapek-modules/trunk/gui-core-ui/resources/
    escapek-modules/trunk/gui-core-ui/src/
    escapek-modules/trunk/gui-core-ui/src/main/
    escapek-modules/trunk/gui-core-ui/src/main/java/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/AbstractContentProvider.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/EscapeKEditorInput.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/EscapeKFormPage.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/EscapeKWizardPage.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/FormBuilder.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/IEscapeKEditor.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/INodeEditor.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/ModelWrapper.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/NavigatorRoot.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/SharedImages.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/databinding/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/databinding/DataBindingContextFactory.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/dialogs/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/dialogs/NavigatorSelectionDialog.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/dialogs/StatusReportDialog.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/editors/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/editors/forms/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/exceptions/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/exceptions/UIException.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/internal/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/internal/UIActivator.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/internal/nls/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/internal/nls/StatusReportDialogMessages.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/NodeIdSection.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/NodeInstanceFilter.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/NodeInstanceNameSection.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/NodeStatusSection.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/PropertySheetAdapterFactory.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/PropertySheetContributor.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/properties/PropertySheetTitleProvider.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/tabbedProperties/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/tabbedProperties/providers/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/tools/
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/tools/DialogTools.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/tools/FormTools.java
    escapek-modules/trunk/gui-core-ui/src/main/java/org/escapek/gui/core/ui/tools/RegistryUITools.java
    escapek-modules/trunk/gui-core-ui/src/main/resources/
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/.cvsignore
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/application_home.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/base.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/building.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/checkpoint.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/component_group.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/debug.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/disabled/
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/disabled/refresh.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/disabled/refresh_reload.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/email.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/error.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/error_log.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/fatal.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/fldr_obj.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/folder.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/folder_ciclass.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/folder_key.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/group.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/group_add.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/info.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/key.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/letter.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/manage_rep.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/monitor_folder.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/monitoring_explorer.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/phone.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/refresh.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/refresh_reload.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/registry_node.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/registry_value.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/repository.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/repository.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/repository_connection.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/server.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/site.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/tick.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/user.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/user_add.png
    escapek-modules/trunk/gui-core-ui/src/main/resources/icons/warning.gif
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/escapek/
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/escapek/core/
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/escapek/core/ui/
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/escapek/core/ui/internal/
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/escapek/core/ui/internal/nls/
    escapek-modules/trunk/gui-core-ui/src/main/resources/org/escapek/core/ui/internal/nls/StatusReportDialogMessages.properties
    escapek-modules/trunk/gui-core-ui/src/main/resources/schemas/
    escapek-modules/trunk/gui-core-ui/src/main/resources/schemas/repositoryCreationJob.exsd
    escapek-modules/trunk/gui-nl-fragment/
    escapek-modules/trunk/gui-nl-fragment/.classpath
    escapek-modules/trunk/gui-nl-fragment/.project
    escapek-modules/trunk/gui-nl-fragment/.settings/
    escapek-modules/trunk/gui-nl-fragment/META-INF/
    escapek-modules/trunk/gui-nl-fragment/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-nl-fragment/build.properties
    escapek-modules/trunk/gui-nl-fragment/nl/
    escapek-modules/trunk/gui-nl-fragment/nl/en/
    escapek-modules/trunk/gui-nl-fragment/nl/en/contact_titles.csv
    escapek-modules/trunk/gui-nl-fragment/nl/en/country_codes.csv
    escapek-modules/trunk/gui-nl-fragment/nl/en/introContent.xml
    escapek-modules/trunk/gui-nl-fragment/nl/en/os_versions.csv
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/Thumbs.db
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/concept1.xhtml
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/concept2.xhtml
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/link_obj.gif
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/root.css
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/root.xhtml
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/shared.css
    escapek-modules/trunk/gui-nl-fragment/nl/en/resources/intro/titlebanner.gif
    escapek-modules/trunk/gui-nl-fragment/nl/fr/
    escapek-modules/trunk/gui-nl-fragment/nl/fr/contact_titles.csv
    escapek-modules/trunk/gui-nl-fragment/nl/fr/country_codes.csv
    escapek-modules/trunk/gui-nl-fragment/nl/fr/os_versions.csv
    escapek-modules/trunk/gui-nl-fragment/plugin_en.properties
    escapek-modules/trunk/gui-nl-fragment/plugin_fr.properties
    escapek-modules/trunk/gui-nl-fragment/pom.xml
    escapek-modules/trunk/gui-nl-fragment/src/
    escapek-modules/trunk/gui-nl-fragment/src/main/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/internal/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/internal/nls/
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/internal/nls/CommonUIMessages_fr.properties
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/internal/nls/DialogMessages_fr.properties
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/internal/nls/ErrorMessages_fr.properties
    escapek-modules/trunk/gui-nl-fragment/src/main/resources/org/escapek/client/internal/nls/ServiceTesterMessages_fr.properties
    escapek-modules/trunk/gui-nls/
    escapek-modules/trunk/gui-nls/.classpath
    escapek-modules/trunk/gui-nls/.project
    escapek-modules/trunk/gui-nls/.settings/
    escapek-modules/trunk/gui-nls/META-INF/
    escapek-modules/trunk/gui-nls/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-nls/build.properties
    escapek-modules/trunk/gui-nls/plugin.xml
    escapek-modules/trunk/gui-nls/pom.xml
    escapek-modules/trunk/gui-nls/src/
    escapek-modules/trunk/gui-nls/src/main/
    escapek-modules/trunk/gui-nls/src/main/java/
    escapek-modules/trunk/gui-nls/src/main/java/org/
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/CommonMessages.java
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/ErrorMessages.java
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/ExceptionsMessages.java
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/JobMessages.java
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/NLSActivator.java
    escapek-modules/trunk/gui-nls/src/main/java/org/escapek/gui/nls/ServerUIMessages.java
    escapek-modules/trunk/gui-nls/src/main/resources/
    escapek-modules/trunk/gui-nls/src/main/resources/org/
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/nls/
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/nls/CommonMessages.properties
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/nls/ErrorMessages.properties
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/nls/ExceptionsMessages.properties
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/nls/JobMessages.properties
    escapek-modules/trunk/gui-nls/src/main/resources/org/escapek/gui/nls/ServerUIMessages.properties
    escapek-modules/trunk/gui-nls/src/test/
    escapek-modules/trunk/gui-nls/src/test/java/
    escapek-modules/trunk/gui-objectmanager-ui/
    escapek-modules/trunk/gui-objectmanager-ui/.classpath
    escapek-modules/trunk/gui-objectmanager-ui/.project
    escapek-modules/trunk/gui-objectmanager-ui/.settings/
    escapek-modules/trunk/gui-objectmanager-ui/.settings/org.eclipse.jdt.ui.prefs
    escapek-modules/trunk/gui-objectmanager-ui/.settings/org.maven.ide.eclipse.prefs
    escapek-modules/trunk/gui-objectmanager-ui/META-INF/
    escapek-modules/trunk/gui-objectmanager-ui/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-objectmanager-ui/build.properties
    escapek-modules/trunk/gui-objectmanager-ui/plugin.properties
    escapek-modules/trunk/gui-objectmanager-ui/plugin.xml
    escapek-modules/trunk/gui-objectmanager-ui/pom.xml
    escapek-modules/trunk/gui-objectmanager-ui/resources/
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/abstract_co.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/ass_class.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/association_ov.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/class.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/compile.png
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/file_obj.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/flatLayout.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/folder.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/hierarchicalLayout.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/inherit_prop_co.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/instance_obj.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/instance_view.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/key_ovr.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/linked_co.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/models.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/namespace.png
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/new_untitled_text_file.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/newfolder_wiz.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/over_co.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/property_co.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/schema.gif
    escapek-modules/trunk/gui-objectmanager-ui/resources/icons/schema_empty.gif
    escapek-modules/trunk/gui-objectmanager-ui/src/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/ObjectManagerPerspective.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/SharedImages.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/actions/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/actions/FlatBrowserAction.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/actions/GroupCIMModelsBrowserAction.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/actions/HierarchicalBrowserAction.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/editors/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/Activator.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/preferences/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/preferences/Initializer.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/preferences/PreferencesConstants.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/DataTypes.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/DataTypes.properties
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/ErrorMessages.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/ErrorMessages.properties
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/UIMessages.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/internal/resources/UIMessages.properties
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/navigator/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/navigator/MOFNavigator.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/navigator/ObjectBrowser.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMClassParentClassSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMClassTypeSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMElementNameSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMModelDescriptionSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMPropertyDefaultValueSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMPropertyInheritedSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMPropertyOverrideSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMPropertyTypeSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMQualifiedElementDescriptionSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/properties/sections/CIMQualifiedElementQualifiersSection.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMClassContentProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMClassLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMElementLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMModelContentProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMModelLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMNameSpaceContentProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMNameSpaceLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMPropertyContentProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMPropertyInstanceLabelDecorator.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMPropertyLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMSchemaContentProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/CIMSchemaLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewContentProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewDecoratingLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/providers/InstanceViewLabelProvider.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/views/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/views/InstanceView.java
    escapek-modules/trunk/gui-objectmanager-ui/src/main/java/org/escapek/gui/objectmanager/ui/wizards/
    escapek-modules/trunk/gui-objectmanager-ui/src/main/resources/
    escapek-modules/trunk/gui-objectmanager-ui/src/test/
    escapek-modules/trunk/gui-objectmanager-ui/src/test/java/
    escapek-modules/trunk/gui-preferences/
    escapek-modules/trunk/gui-preferences/.classpath
    escapek-modules/trunk/gui-preferences/.project
    escapek-modules/trunk/gui-preferences/.settings/
    escapek-modules/trunk/gui-preferences/.settings/org.eclipse.jdt.core.prefs
    escapek-modules/trunk/gui-preferences/META-INF/
    escapek-modules/trunk/gui-preferences/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-preferences/build.properties
    escapek-modules/trunk/gui-preferences/plugin.xml
    escapek-modules/trunk/gui-preferences/pom.xml
    escapek-modules/trunk/gui-preferences/src/
    escapek-modules/trunk/gui-preferences/src/main/
    escapek-modules/trunk/gui-preferences/src/main/java/
    escapek-modules/trunk/gui-preferences/src/main/java/org/
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/preferences/
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/preferences/Initializer.java
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/preferences/PreferenceConstants.java
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/preferences/PreferencesPlugin.java
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/preferences/tools/
    escapek-modules/trunk/gui-preferences/src/main/java/org/escapek/preferences/tools/RepositoryTools.java
    escapek-modules/trunk/gui-services-configurator/
    escapek-modules/trunk/gui-services-configurator/.classpath
    escapek-modules/trunk/gui-services-configurator/.project
    escapek-modules/trunk/gui-services-configurator/.settings/
    escapek-modules/trunk/gui-services-configurator/META-INF/
    escapek-modules/trunk/gui-services-configurator/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-services-configurator/META-INF/spring/
    escapek-modules/trunk/gui-services-configurator/META-INF/spring/bundle-context-osgi.xml
    escapek-modules/trunk/gui-services-configurator/META-INF/spring/bundle-context.xml
    escapek-modules/trunk/gui-services-configurator/build.properties
    escapek-modules/trunk/gui-services-configurator/plugin.xml
    escapek-modules/trunk/gui-services-configurator/pom.xml
    escapek-modules/trunk/gui-services-configurator/src/
    escapek-modules/trunk/gui-services-configurator/src/main/
    escapek-modules/trunk/gui-services-configurator/src/main/java/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/AbstractConfigurator.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ConfigConstants.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/IConfigurator.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/event/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/event/ConfigurationEvent.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/exceptions/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/exceptions/ConfigurationFailedException.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/internal/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/internal/Activator.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/internal/ConfigurationManager.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/internal/ConfiguratorContribution.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/internal/nls/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/internal/nls/NewConfigurationWizardMessages.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/manager/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/manager/IConfigurationListener.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/manager/IConfigurationManager.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/nls/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/nls/ConfiguratorMessages.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/nls/ConfiguratorMessages.properties
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/IProgressMonitorProvider.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/wizard/
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/wizard/AbstractConfiguratorWizardPage.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/wizard/ConfiguratorSelectionWizardPage.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/wizard/IConfiguratorWizardPage.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/wizard/NewConfigurationWizard.java
    escapek-modules/trunk/gui-services-configurator/src/main/java/org/escapek/gui/services/configurator/ui/wizard/SummaryWizardPage.java
    escapek-modules/trunk/gui-services-configurator/src/main/resources/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/META-INF/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/gui/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/gui/services/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/gui/services/configurator/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/gui/services/configurator/internal/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/gui/services/configurator/internal/nls/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/org/escapek/gui/services/configurator/internal/nls/NewConfigurationWizardMessages.properties
    escapek-modules/trunk/gui-services-configurator/src/main/resources/schema/
    escapek-modules/trunk/gui-services-configurator/src/main/resources/schema/configurator.exsd
    escapek-modules/trunk/gui-services-configurator-embedded/
    escapek-modules/trunk/gui-services-configurator-embedded/.classpath
    escapek-modules/trunk/gui-services-configurator-embedded/.project
    escapek-modules/trunk/gui-services-configurator-embedded/.settings/
    escapek-modules/trunk/gui-services-configurator-embedded/META-INF/
    escapek-modules/trunk/gui-services-configurator-embedded/META-INF/MANIFEST.MF
    escapek-modules/trunk/gui-services-configurator-embedded/build.properties
    escapek-modules/trunk/gui-services-configurator-embedded/plugin.xml
    escapek-modules/trunk/gui-services-configurator-embedded/pom.xml
    escapek-modules/trunk/gui-services-configurator-embedded/src/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/embedded/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/embedded/EmbeddedConfigurator.java
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/embedded/internal/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/embedded/internal/Activator.java
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/embedded/internal/nls/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/java/org/escapek/gui/services/configurator/embedded/internal/nls/EmbeddedConfiguratorMessages.java
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/services/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/services/configurator/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/services/configurator/embedded/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/services/configurator/embedded/internal/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/services/configurator/embedded/internal/nls/
    escapek-modules/trunk/gui-services-configurator-embedded/src/main/resources/org/escapek/gui/services/configurator/embedded/internal/nls/EmbeddedConfiguratorMessages.properties
    escapek-modules/trunk/logger/
    escapek-modules/trunk/logger/.classpath
    escapek-modules/trunk/logger/.project
    escapek-modules/trunk/logger/.settings/
    escapek-modules/trunk/logger/.settings/org.eclipse.jdt.core.prefs
    escapek-modules/trunk/logger/META-INF/
    escapek-modules/trunk/logger/META-INF/MANIFEST.MF
    escapek-modules/trunk/logger/build.properties
...
 
[truncated message content]

[Escapek-commits] SF.net SVN: escapek:[818] escapek-modules/trunk/

From: <nic...@us...> - 2008-09-06 18:56:33

Revision: 818
          http://escapek.svn.sourceforge.net/escapek/?rev=818&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 18:56:30 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    escapek-modules/trunk/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek:[817] escapek-modules/

From: <nic...@us...> - 2008-09-06 18:56:21

Revision: 817
          http://escapek.svn.sourceforge.net/escapek/?rev=817&view=rev
Author:   nicolasjouanin
Date:     2008-09-06 18:56:18 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------


Added Paths:
-----------
    escapek-modules/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [816] org.escapek.client.ui.security/trunk/src/org/ escapek/client/ui/security/editors/forms/RoleMainFormPage.java

From: <nic...@us...> - 2007-02-16 10:19:46

Revision: 816
          http://svn.sourceforge.net/escapek/?rev=816&view=rev
Author:   nicolasjouanin
Date:     2007-02-16 02:19:34 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
Merging

Modified Paths:
--------------
    org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java

Modified: org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java
===================================================================
--- org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java	2007-02-15 20:47:54 UTC (rev 815)
+++ org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java	2007-02-16 10:19:34 UTC (rev 816)
@@ -1,379 +1,379 @@
-/**
- * Escape-K
- * Copyright (C) 2006 Nicolas Jouanin, and individual contributors 
- * as indicated by the @authors tag. See copyright.txt in the
- * distribution for a full listing of individual contributors.
- * Contact: es...@gm...
- *
- * This file is part of Escape-K.
- * 
- * Escape-K is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Escape-K is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Foobar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * --------------------------------------------------------------------------
- * $Id$
- * --------------------------------------------------------------------------
- */
-package org.escapek.client.ui.security.editors.forms;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.databinding.BindingEvent;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.IBindingListener;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.map.IObservableMap;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.escapek.client.core.services.ObjectChangeService;
-import org.escapek.client.core.ui.EscapeKFormPage;
-import org.escapek.client.core.ui.databinding.DataBindingContextFactory;
-import org.escapek.client.ui.security.SecurityActivator;
-import org.escapek.client.ui.security.editors.RoleEditorInput;
-import org.escapek.client.ui.security.editors.forms.providers.ObservableUserLabelProvider;
-import org.escapek.client.ui.tools.FormTools;
-import org.escapek.core.dto.security.RoleDTO;
-import org.escapek.core.dto.security.TicketDTO;
-import org.escapek.core.dto.security.UserDTO;
-import org.escapek.core.exceptions.EntityNotFoundException;
-import org.escapek.core.exceptions.SecurityException;
-import org.escapek.core.serviceManager.ServiceWrapper;
-import org.escapek.core.serviceManager.Exceptions.ConnectionException;
-import org.escapek.core.services.interfaces.IRemoteSecurityService;
-import org.escapek.i18n.LocaleService;
-import org.escapek.i18n.MessageService;
-import org.escapek.logger.LoggerPlugin;
-import org.escapek.logger.LoggingConstants;
-
-/**
- * 
- * @author nicolasjouanin
- *
- */
-public class RoleMainFormPage extends EscapeKFormPage
-	implements IBindingListener
-{
-	private RoleDTO editedRole;
-	private List<UserDTO> userList;
-	private List<RoleDTO> roleList;
-	private FormToolkit toolkit;
-	private String title;
-	private Text nameText;
-	private Text descText;
-	private TableViewer userViewer;
-	private TableViewer roleViewer;
-	private Button addUserButton;
-	private Button delUserButton;
-	private Button addRoleButton;
-	private Button delRoleButton;
-	private boolean dirty;
-	private DataBindingContext bindingContext;
-
-	private MessageService message;
-	private MessageService commonMessages;
-	
-	private IRemoteSecurityService securityService;
-
-	public RoleMainFormPage(FormEditor editor, String id, String title)
-	{
-		super(editor, id, title);
-		this.title = title;
-		message = LocaleService.getMessageService(LocaleService.uiMessages);
-		commonMessages = LocaleService.getMessageService(LocaleService.commonMessages);
-
-		dirty = false;
-		editedRole = ((RoleEditorInput)(editor.getEditorInput())).getRole();
-		userList = new ArrayList<UserDTO>();
-		
-		try
-		{
-			securityService = ServiceWrapper.getInstance().getSecurityService();
-		}
-		catch (ConnectionException e)
-		{
-			//This exception should have already been tested
-			LoggerPlugin.LogWarning(SecurityActivator.PLUGIN_ID, LoggingConstants.UNEXPECTED_EXCEPTION, 
-				"Couldn't get Security service", e);
-		}
-	}
-	
-	@Override
-	protected void createFormContent(IManagedForm managedForm)
-	{
-		toolkit = managedForm.getToolkit();
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		managedForm.getForm().getBody().setLayout(layout);
-		managedForm.getForm().setText(this.title);
-
-		createMainSection(managedForm);
-		//createInheritedRoleSection(managedForm);
-		createMemberUserSection(managedForm);
-
-		//Data binding
-		bindGUI();
-	}
-	
-	private void createMainSection(IManagedForm managedForm)
-	{
-		GridData data = new GridData();
-		Section dataSection = toolkit.createSection(managedForm.getForm().getBody(),
-				Section.TITLE_BAR|Section.EXPANDED);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.colspan = 2;
-		dataSection.setLayoutData(td);
-		dataSection.setText(message.getString("roleEditor.mainForm.dataSection.title"));
-		
-		Composite sectionClient = toolkit.createComposite(dataSection);
-		GridLayout clientLayout = new GridLayout();
-		clientLayout.numColumns = 2;
-		sectionClient.setLayout(clientLayout);
-
-		//Id
-		FormTools.createLabel(sectionClient, toolkit, commonMessages.getString("common.repId.label"));
-		Text idText = toolkit.createText(sectionClient, "", SWT.BORDER | SWT.READ_ONLY);
-		idText.setText(editedRole.getId().toString());
-		idText.setEditable(false);
-		data = new GridData(SWT.LEFT, SWT.FILL, false, false);
-		idText.setLayoutData(data);
-
-		//Name
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		FormTools.createLabel(sectionClient, toolkit, message.getString("roleEditor.mainForm.dataSection.name.label"), data);
-		nameText = toolkit.createText(sectionClient, "", SWT.BORDER);
-		data = new GridData(SWT.FILL, SWT.FILL, true, false);
-		nameText.setLayoutData(data);
-
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		FormTools.createLabel(sectionClient, toolkit, commonMessages.getString("common.description.label"), data);
-		
-		//Description
-		descText = toolkit.createText(sectionClient, "", SWT.MULTI);
-		descText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-		data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.heightHint = 50;
-		descText.setLayoutData(data);
-
-		toolkit.paintBordersFor(dataSection);
-		dataSection.setClient(sectionClient);
-		
-	}
-
-	private void createInheritedRoleSection(IManagedForm managedForm)
-	{
-		GridData data = new GridData();
-		Section section = toolkit.createSection(managedForm.getForm().getBody(),
-				Section.TITLE_BAR|Section.EXPANDED);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.colspan = 2;
-		section.setLayoutData(td);
-		section.setText(message.getString("roleEditor.mainForm.grantedUserSection.title"));
-		
-		Composite sectionClient = toolkit.createComposite(section);
-		GridLayout clientLayout = new GridLayout();
-		clientLayout.numColumns = 2;
-		sectionClient.setLayout(clientLayout);
-
-		Table roleTable = toolkit.createTable(sectionClient, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
-		TableColumn nameColumn = new TableColumn(roleTable, SWT.LEFT);
-		nameColumn.setText(commonMessages.getString("common.roleName.columnText"));
-		nameColumn.setWidth(100);
-		roleTable.setHeaderVisible(true);
-		TableColumn descColumn = new TableColumn(roleTable, SWT.LEFT);
-		descColumn.setText(commonMessages.getString("common.desc.columnText"));
-		descColumn.setWidth(400);
-		data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.heightHint = 200;
-		data.verticalSpan = 2;
-		roleTable.setLayoutData(data);
-		roleViewer = new TableViewer(roleTable);
-
-		addRoleButton = toolkit.createButton(sectionClient, 
-			commonMessages.getString("common.addButton.text"), SWT.NONE);
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		addRoleButton.setLayoutData(data);
-		delRoleButton = toolkit.createButton(sectionClient, 
-			commonMessages.getString("common.delButton.text"), SWT.NONE);
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		delRoleButton.setLayoutData(data);
-		toolkit.paintBordersFor(section);
-		section.setClient(sectionClient);
-	}
-
-	private void createMemberUserSection(IManagedForm managedForm)
-	{
-		GridData data = new GridData();
-		Section section = toolkit.createSection(managedForm.getForm().getBody(),
-				Section.TITLE_BAR|Section.EXPANDED);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.colspan = 2;
-		section.setLayoutData(td);
-		section.setText(message.getString("roleEditor.mainForm.grantedUserSection.title"));
-		
-		Composite sectionClient = toolkit.createComposite(section);
-		GridLayout clientLayout = new GridLayout();
-		clientLayout.numColumns = 2;
-		sectionClient.setLayout(clientLayout);
-
-		Table memberTable = toolkit.createTable(sectionClient, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
-		TableColumn loginColumn = new TableColumn(memberTable, SWT.LEFT);
-		loginColumn.setText(commonMessages.getString("common.login.columnText"));
-		loginColumn.setWidth(100);
-		memberTable.setHeaderVisible(true);
-		TableColumn descColumn = new TableColumn(memberTable, SWT.LEFT);
-		descColumn.setText(commonMessages.getString("common.desc.columnText"));
-		descColumn.setWidth(400);
-		data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.heightHint = 200;
-		data.verticalSpan = 2;
-		memberTable.setLayoutData(data);
-		userViewer = new TableViewer(memberTable);
-
-		addUserButton = toolkit.createButton(sectionClient, 
-			commonMessages.getString("common.addButton.text"), SWT.NONE);
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		addUserButton.setLayoutData(data);
-		delUserButton = toolkit.createButton(sectionClient, 
-			commonMessages.getString("common.delButton.text"), SWT.NONE);
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		delUserButton.setLayoutData(data);
-		toolkit.paintBordersFor(section);
-		section.setClient(sectionClient);
-	}
-
-	protected void bindGUI()
-	{
-		bindingContext = DataBindingContextFactory.create();
-		bindingContext.bindValue(SWTObservables.observeText(nameText, SWT.Modify),
-				BeansObservables.observeValue(editedRole, "name"), null);
-		bindingContext.bindValue(SWTObservables.observeText(descText, SWT.Modify),
-				BeansObservables.observeValue(editedRole, "description"), null);
-		
-		//Tables Binding
-		ObservableListContentProvider memberViewerContentProvider = new ObservableListContentProvider();
-		userViewer.setContentProvider(memberViewerContentProvider);
-		IObservableMap[] userAttributeMaps = BeansObservables.observeMaps(
-			memberViewerContentProvider.getKnownElements(), UserDTO.class,
-			new String[] { "loginString" ,"description"});
-		userViewer.setLabelProvider(new ObservableUserLabelProvider(userAttributeMaps));
-
-//		ObservableListContentProvider roleViewerContentProvider = new ObservableListContentProvider();
-//		roleViewer.setContentProvider(roleViewerContentProvider);
-//		IObservableMap[] roleAttributeMaps = BeansObservables.observeMaps(
-//			memberViewerContentProvider.getKnownElements(), RoleDTO.class,
-//			new String[] { "name" ,"description"});
-//		roleViewer.setLabelProvider(new ObservableRoleLabelProvider(roleAttributeMaps));
-
-		try
-		{
-			TicketDTO ticket = ServiceWrapper.getInstance().getTicket();
-			Collection<UserDTO> users = securityService.getRoleGrantedUsers(ticket.getId(), editedRole.getId());
-			if(users != null)
-				userList.addAll(users);
-			userViewer.setInput(new WritableList(SWTObservables.getRealm(Display.getDefault()), userList, UserDTO.class));
-
-//			Collection<RoleDTO> roles = securityService.getInheritedRoles(ticket.getId(), editedRole.getId());
-//			if(roles != null)
-//				roleList.addAll(roles);
-//			roleViewer.setInput(new WritableList(SWTObservables.getRealm(Display.getDefault()), roleList, RoleDTO.class));
-		}
-		catch(SecurityException e)
-		{
-			
-		}
-		//Modification listener
-		bindingContext.addBindingEventListener(this);
-	}
-
-	public IStatus handleBindingEvent(BindingEvent e)
-	{
-		if(e.copyType == BindingEvent.EVENT_COPY_TO_MODEL &&
-			e.pipelinePosition == BindingEvent.PIPELINE_AFTER_GET &&
-			!dirty)
-		{
-			dirty = true;
-			firePropertyChange(PROP_DIRTY);
-		}
-		return Status.OK_STATUS;
-	}
-
-	@Override
-	public void doSave(IProgressMonitor monitor)
-	{
-		monitor.beginTask(message.getString("roleEditor.info.saveInProgress"), 3);
-		bindingContext.updateModels();
-		monitor.worked(1);
-		try
-		{
-			IRemoteSecurityService security = ServiceWrapper.getInstance().getSecurityService();
-			TicketDTO ticket = ServiceWrapper.getInstance().getTicket();
-			RoleDTO updatedRole = security.updateRole(ticket.getId(), editedRole);
-			monitor.worked(1);
-			editedRole.setName(updatedRole.getName());
-			editedRole.setDescription(updatedRole.getDescription());
-			bindingContext.updateTargets();
-			monitor.worked(1);
-		}
-		catch (ConnectionException e)
-		{
-			monitor.setCanceled(true);
-		}
-		catch (EntityNotFoundException e)
-		{
-			monitor.setCanceled(true);
-		}
-		catch (SecurityException e)
-		{
-			monitor.setCanceled(true);
-			//TODO : manage it
-		}
-		monitor.done();
-		ObjectChangeService.getInstance().fireObjectChanged(editedRole);
-	}
-
-	@Override
-	public boolean isDirty()
-	{
-		return dirty;
-	}
-
-	@Override
-	public void dispose()
-	{
-		editedRole = null;
-		super.dispose();
-	}
-}
+/**
+ * Escape-K
+ * Copyright (C) 2006 Nicolas Jouanin, and individual contributors 
+ * as indicated by the @authors tag. See copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ * Contact: es...@gm...
+ *
+ * This file is part of Escape-K.
+ * 
+ * Escape-K is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escape-K is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.client.ui.security.editors.forms;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.databinding.BindingEvent;
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.IBindingListener;
+import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.TableWrapData;
+import org.eclipse.ui.forms.widgets.TableWrapLayout;
+import org.escapek.client.core.services.ObjectChangeService;
+import org.escapek.client.core.ui.EscapeKFormPage;
+import org.escapek.client.core.ui.databinding.DataBindingContextFactory;
+import org.escapek.client.ui.security.SecurityActivator;
+import org.escapek.client.ui.security.editors.RoleEditorInput;
+import org.escapek.client.ui.security.editors.forms.providers.ObservableUserLabelProvider;
+import org.escapek.client.ui.tools.FormTools;
+import org.escapek.core.dto.security.RoleDTO;
+import org.escapek.core.dto.security.TicketDTO;
+import org.escapek.core.dto.security.UserDTO;
+import org.escapek.core.exceptions.EntityNotFoundException;
+import org.escapek.core.exceptions.SecurityException;
+import org.escapek.core.serviceManager.ServiceWrapper;
+import org.escapek.core.serviceManager.Exceptions.ConnectionException;
+import org.escapek.core.services.interfaces.IRemoteSecurityService;
+import org.escapek.i18n.LocaleService;
+import org.escapek.i18n.MessageService;
+import org.escapek.logger.LoggerPlugin;
+import org.escapek.logger.LoggingConstants;
+
+/**
+ * 
+ * @author nicolasjouanin
+ *
+ */
+public class RoleMainFormPage extends EscapeKFormPage
+	implements IBindingListener
+{
+	private RoleDTO editedRole;
+	private List<UserDTO> userList;
+	private List<RoleDTO> roleList;
+	private FormToolkit toolkit;
+	private String title;
+	private Text nameText;
+	private Text descText;
+	private TableViewer userViewer;
+	private TableViewer roleViewer;
+	private Button addUserButton;
+	private Button delUserButton;
+	private Button addRoleButton;
+	private Button delRoleButton;
+	private boolean dirty;
+	private DataBindingContext bindingContext;
+
+	private MessageService message;
+	private MessageService commonMessages;
+	
+	private IRemoteSecurityService securityService;
+
+	public RoleMainFormPage(FormEditor editor, String id, String title)
+	{
+		super(editor, id, title);
+		this.title = title;
+		message = LocaleService.getMessageService(LocaleService.uiMessages);
+		commonMessages = LocaleService.getMessageService(LocaleService.commonMessages);
+
+		dirty = false;
+		editedRole = ((RoleEditorInput)(editor.getEditorInput())).getRole();
+		userList = new ArrayList<UserDTO>();
+		
+		try
+		{
+			securityService = ServiceWrapper.getInstance().getSecurityService();
+		}
+		catch (ConnectionException e)
+		{
+			//This exception should have already been tested
+			LoggerPlugin.LogWarning(SecurityActivator.PLUGIN_ID, LoggingConstants.UNEXPECTED_EXCEPTION, 
+				"Couldn't get Security service", e);
+		}
+	}
+	
+	@Override
+	protected void createFormContent(IManagedForm managedForm)
+	{
+		toolkit = managedForm.getToolkit();
+		TableWrapLayout layout = new TableWrapLayout();
+		layout.numColumns = 2;
+		managedForm.getForm().getBody().setLayout(layout);
+		managedForm.getForm().setText(this.title);
+
+		createMainSection(managedForm);
+		//createInheritedRoleSection(managedForm);
+		createMemberUserSection(managedForm);
+
+		//Data binding
+		bindGUI();
+	}
+	
+	private void createMainSection(IManagedForm managedForm)
+	{
+		GridData data = new GridData();
+		Section dataSection = toolkit.createSection(managedForm.getForm().getBody(),
+				Section.TITLE_BAR|Section.EXPANDED);
+		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
+		td.colspan = 2;
+		dataSection.setLayoutData(td);
+		dataSection.setText(message.getString("roleEditor.mainForm.dataSection.title"));
+		
+		Composite sectionClient = toolkit.createComposite(dataSection);
+		GridLayout clientLayout = new GridLayout();
+		clientLayout.numColumns = 2;
+		sectionClient.setLayout(clientLayout);
+
+		//Id
+		FormTools.createLabel(sectionClient, toolkit, commonMessages.getString("common.repId.label"));
+		Text idText = toolkit.createText(sectionClient, "", SWT.BORDER | SWT.READ_ONLY);
+		idText.setText(editedRole.getId().toString());
+		idText.setEditable(false);
+		data = new GridData(SWT.LEFT, SWT.FILL, false, false);
+		idText.setLayoutData(data);
+
+		//Name
+		data = new GridData(SWT.FILL, SWT.TOP, false, false);
+		FormTools.createLabel(sectionClient, toolkit, message.getString("roleEditor.mainForm.dataSection.name.label"), data);
+		nameText = toolkit.createText(sectionClient, "", SWT.BORDER);
+		data = new GridData(SWT.FILL, SWT.FILL, true, false);
+		nameText.setLayoutData(data);
+
+		data = new GridData(SWT.FILL, SWT.TOP, false, false);
+		FormTools.createLabel(sectionClient, toolkit, commonMessages.getString("common.description.label"), data);
+		
+		//Description
+		descText = toolkit.createText(sectionClient, "", SWT.MULTI);
+		descText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
+		data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.heightHint = 50;
+		descText.setLayoutData(data);
+
+		toolkit.paintBordersFor(dataSection);
+		dataSection.setClient(sectionClient);
+		
+	}
+
+	private void createInheritedRoleSection(IManagedForm managedForm)
+	{
+		GridData data = new GridData();
+		Section section = toolkit.createSection(managedForm.getForm().getBody(),
+				Section.TITLE_BAR|Section.EXPANDED);
+		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
+		td.colspan = 2;
+		section.setLayoutData(td);
+		section.setText(message.getString("roleEditor.mainForm.grantedUserSection.title"));
+		
+		Composite sectionClient = toolkit.createComposite(section);
+		GridLayout clientLayout = new GridLayout();
+		clientLayout.numColumns = 2;
+		sectionClient.setLayout(clientLayout);
+
+		Table roleTable = toolkit.createTable(sectionClient, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
+		TableColumn nameColumn = new TableColumn(roleTable, SWT.LEFT);
+		nameColumn.setText(commonMessages.getString("common.roleName.columnText"));
+		nameColumn.setWidth(100);
+		roleTable.setHeaderVisible(true);
+		TableColumn descColumn = new TableColumn(roleTable, SWT.LEFT);
+		descColumn.setText(commonMessages.getString("common.desc.columnText"));
+		descColumn.setWidth(400);
+		data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.heightHint = 200;
+		data.verticalSpan = 2;
+		roleTable.setLayoutData(data);
+		roleViewer = new TableViewer(roleTable);
+
+		addRoleButton = toolkit.createButton(sectionClient, 
+			commonMessages.getString("common.addButton.text"), SWT.NONE);
+		data = new GridData(SWT.FILL, SWT.TOP, false, false);
+		addRoleButton.setLayoutData(data);
+		delRoleButton = toolkit.createButton(sectionClient, 
+			commonMessages.getString("common.delButton.text"), SWT.NONE);
+		data = new GridData(SWT.FILL, SWT.TOP, false, false);
+		delRoleButton.setLayoutData(data);
+		toolkit.paintBordersFor(section);
+		section.setClient(sectionClient);
+	}
+
+	private void createMemberUserSection(IManagedForm managedForm)
+	{
+		GridData data = new GridData();
+		Section section = toolkit.createSection(managedForm.getForm().getBody(),
+				Section.TITLE_BAR|Section.EXPANDED);
+		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
+		td.colspan = 2;
+		section.setLayoutData(td);
+		section.setText(message.getString("roleEditor.mainForm.grantedUserSection.title"));
+		
+		Composite sectionClient = toolkit.createComposite(section);
+		GridLayout clientLayout = new GridLayout();
+		clientLayout.numColumns = 2;
+		sectionClient.setLayout(clientLayout);
+
+		Table memberTable = toolkit.createTable(sectionClient, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
+		TableColumn loginColumn = new TableColumn(memberTable, SWT.LEFT);
+		loginColumn.setText(commonMessages.getString("common.login.columnText"));
+		loginColumn.setWidth(100);
+		memberTable.setHeaderVisible(true);
+		TableColumn descColumn = new TableColumn(memberTable, SWT.LEFT);
+		descColumn.setText(commonMessages.getString("common.desc.columnText"));
+		descColumn.setWidth(400);
+		data = new GridData(SWT.FILL, SWT.FILL, true, true);
+		data.heightHint = 200;
+		data.verticalSpan = 2;
+		memberTable.setLayoutData(data);
+		userViewer = new TableViewer(memberTable);
+
+		addUserButton = toolkit.createButton(sectionClient, 
+			commonMessages.getString("common.addButton.text"), SWT.NONE);
+		data = new GridData(SWT.FILL, SWT.TOP, false, false);
+		addUserButton.setLayoutData(data);
+		delUserButton = toolkit.createButton(sectionClient, 
+			commonMessages.getString("common.delButton.text"), SWT.NONE);
+		data = new GridData(SWT.FILL, SWT.TOP, false, false);
+		delUserButton.setLayoutData(data);
+		toolkit.paintBordersFor(section);
+		section.setClient(sectionClient);
+	}
+
+	protected void bindGUI()
+	{
+		bindingContext = DataBindingContextFactory.create();
+		bindingContext.bindValue(SWTObservables.observeText(nameText, SWT.Modify),
+				BeansObservables.observeValue(editedRole, "name"), null);
+		bindingContext.bindValue(SWTObservables.observeText(descText, SWT.Modify),
+				BeansObservables.observeValue(editedRole, "description"), null);
+		
+		//Tables Binding
+		ObservableListContentProvider memberViewerContentProvider = new ObservableListContentProvider();
+		userViewer.setContentProvider(memberViewerContentProvider);
+		IObservableMap[] userAttributeMaps = BeansObservables.observeMaps(
+			memberViewerContentProvider.getKnownElements(), UserDTO.class,
+			new String[] { "loginString" ,"description"});
+		userViewer.setLabelProvider(new ObservableUserLabelProvider(userAttributeMaps));
+
+//		ObservableListContentProvider roleViewerContentProvider = new ObservableListContentProvider();
+//		roleViewer.setContentProvider(roleViewerContentProvider);
+//		IObservableMap[] roleAttributeMaps = BeansObservables.observeMaps(
+//			memberViewerContentProvider.getKnownElements(), RoleDTO.class,
+//			new String[] { "name" ,"description"});
+//		roleViewer.setLabelProvider(new ObservableRoleLabelProvider(roleAttributeMaps));
+
+		try
+		{
+			TicketDTO ticket = ServiceWrapper.getInstance().getTicket();
+			Collection<UserDTO> users = securityService.getRoleGrantedUsers(ticket.getId(), editedRole.getId());
+			if(users != null)
+				userList.addAll(users);
+			userViewer.setInput(new WritableList(SWTObservables.getRealm(Display.getDefault()), userList, UserDTO.class));
+
+//			Collection<RoleDTO> roles = securityService.getInheritedRoles(ticket.getId(), editedRole.getId());
+//			if(roles != null)
+//				roleList.addAll(roles);
+//			roleViewer.setInput(new WritableList(SWTObservables.getRealm(Display.getDefault()), roleList, RoleDTO.class));
+		}
+		catch(SecurityException e)
+		{
+			
+		}
+		//Modification listener
+		bindingContext.addBindingEventListener(this);
+	}
+
+	public IStatus handleBindingEvent(BindingEvent e)
+	{
+		if(e.copyType == BindingEvent.EVENT_COPY_TO_MODEL &&
+			e.pipelinePosition == BindingEvent.PIPELINE_AFTER_GET &&
+			!dirty)
+		{
+			dirty = true;
+			firePropertyChange(PROP_DIRTY);
+		}
+		return Status.OK_STATUS;
+	}
+
+	@Override
+	public void doSave(IProgressMonitor monitor)
+	{
+		monitor.beginTask(message.getString("roleEditor.info.saveInProgress"), 3);
+		bindingContext.updateModels();
+		monitor.worked(1);
+		try
+		{
+			IRemoteSecurityService security = ServiceWrapper.getInstance().getSecurityService();
+			TicketDTO ticket = ServiceWrapper.getInstance().getTicket();
+			RoleDTO updatedRole = security.updateRole(ticket.getId(), editedRole);
+			monitor.worked(1);
+			editedRole.setName(updatedRole.getName());
+			editedRole.setDescription(updatedRole.getDescription());
+			bindingContext.updateTargets();
+			monitor.worked(1);
+		}
+		catch (ConnectionException e)
+		{
+			monitor.setCanceled(true);
+		}
+		catch (EntityNotFoundException e)
+		{
+			monitor.setCanceled(true);
+		}
+		catch (SecurityException e)
+		{
+			monitor.setCanceled(true);
+			//TODO : manage it
+		}
+		monitor.done();
+		ObjectChangeService.getInstance().fireObjectChanged(editedRole);
+	}
+
+	@Override
+	public boolean isDirty()
+	{
+		return dirty;
+	}
+
+	@Override
+	public void dispose()
+	{
+		editedRole = null;
+		super.dispose();
+	}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [815] org.escapek.client.ui.security/trunk/src/org/ escapek/client/ui/security/editors/forms/providers/ ObservableRoleLabelProvider.java

From: <nic...@us...> - 2007-02-15 20:47:58

Revision: 815
          http://svn.sourceforge.net/escapek/?rev=815&view=rev
Author:   nicolasjouanin
Date:     2007-02-15 12:47:54 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Code cleanup.
Make code 3.3M5 API compatible

Added Paths:
-----------
    org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/providers/ObservableRoleLabelProvider.java

Added: org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/providers/ObservableRoleLabelProvider.java
===================================================================
--- org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/providers/ObservableRoleLabelProvider.java	                        (rev 0)
+++ org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/providers/ObservableRoleLabelProvider.java	2007-02-15 20:47:54 UTC (rev 815)
@@ -0,0 +1,66 @@
+/**
+ * Escape-K
+ * Copyright (C) 2006 Nicolas Jouanin, and individual contributors 
+ * as indicated by the @authors tag. See copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ * Contact: es...@gm...
+ *
+ * This file is part of Escape-K.
+ * 
+ * Escape-K is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escape-K is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.client.ui.security.editors.forms.providers;
+
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.escapek.client.ui.SharedImages;
+
+/**
+ * 
+ * @author nicolasjouanin
+ *
+ */
+public class ObservableRoleLabelProvider extends ObservableMapLabelProvider
+{
+	public ObservableRoleLabelProvider(IObservableMap attributeMap)
+	{
+		super(attributeMap);
+	}
+
+	public ObservableRoleLabelProvider(IObservableMap[] attributeMaps)
+	{
+		super(attributeMaps);
+	}
+
+	@Override
+	public Image getImage(Object element)
+	{
+		return SharedImages.getImage(SharedImages.IMAGE_GROUP);
+	}
+
+	@Override
+	public Image getColumnImage(Object element, int columnIndex)
+	{
+		if(columnIndex == 0)
+			return getImage(element);
+		else
+			return super.getColumnImage(element, columnIndex);
+	}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [814]

From: <nic...@us...> - 2007-02-15 20:44:52

Revision: 814
          http://svn.sourceforge.net/escapek/?rev=814&view=rev
Author:   nicolasjouanin
Date:     2007-02-15 12:44:49 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
Code cleanup.
Make code 3.3M5 API compatible

Modified Paths:
--------------
    org.escapek.client/trunk/src/org/escapek/client/Application.java
    org.escapek.client/trunk/src/org/escapek/client/repository/RepositoryCreator.java
    org.escapek.client.cmdb.en/trunk/META-INF/MANIFEST.MF
    org.escapek.client.core/trunk/META-INF/MANIFEST.MF
    org.escapek.client.core/trunk/src/org/escapek/client/core/ui/databinding/DataBindingContextFactory.java
    org.escapek.client.tools/trunk/META-INF/MANIFEST.MF
    org.escapek.client.ui/trunk/src/org/escapek/client/ui/tools/FormTools.java
    org.escapek.client.ui.cmdb/trunk/src/org/escapek/client/ui/cmdb/providers/ContactContentProvider.java
    org.escapek.client.ui.cmdb.en/trunk/META-INF/MANIFEST.MF
    org.escapek.client.ui.cmdb.en/trunk/build.properties
    org.escapek.client.ui.en/trunk/META-INF/MANIFEST.MF
    org.escapek.client.ui.en/trunk/build.properties
    org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java
    org.escapek.i18n/trunk/META-INF/MANIFEST.MF
    org.escapek.i18n.en/trunk/META-INF/MANIFEST.MF
    org.escapek.i18n.fr/trunk/META-INF/MANIFEST.MF
    org.escapek.logger/trunk/META-INF/MANIFEST.MF
    org.escapek.preferences/trunk/META-INF/MANIFEST.MF

Added Paths:
-----------
    org.escapek.client.cmdb/trunk/plugin.properties
    org.escapek.client.ui/trunk/plugin.properties
    org.escapek.client.ui.cmdb/trunk/plugin.properties
    org.escapek.client.ui.security/trunk/plugin.properties
    org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/providers/ObservableUserLabelProvider.java

Removed Paths:
-------------
    org.escapek.client.cmdb.en/trunk/plugin_en.properties
    org.escapek.client.ui.cmdb.en/trunk/plugin_en.properties
    org.escapek.client.ui.en/trunk/plugin_en.properties
    org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/providers/RoleGrantedUserLabelProvider.java
    org.escapek.client.ui.security.en/trunk/plugin_en.properties

Modified: org.escapek.client/trunk/src/org/escapek/client/Application.java
===================================================================
--- org.escapek.client/trunk/src/org/escapek/client/Application.java	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client/trunk/src/org/escapek/client/Application.java	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,27 +1,48 @@
 package org.escapek.client;
 
-import org.eclipse.core.runtime.IPlatformRunnable;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
 
 /**
  * This class controls all aspects of the application's execution
  */
-public class Application implements IPlatformRunnable {
+public class Application implements IApplication
+{
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IPlatformRunnable#run(java.lang.Object)
-	 */
-	public Object run(Object args) throws Exception {
+	public Object start(IApplicationContext context) throws Exception
+	{
 		Display display = PlatformUI.createDisplay();
-		try {
+		try
+		{
 			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
-			if (returnCode == PlatformUI.RETURN_RESTART) {
-				return IPlatformRunnable.EXIT_RESTART;
+			if (returnCode == PlatformUI.RETURN_RESTART)
+			{
+				return IApplication.EXIT_RESTART;
 			}
-			return IPlatformRunnable.EXIT_OK;
-		} finally {
+			return IApplication.EXIT_OK;
+		}
+		finally
+		{
 			display.dispose();
 		}
 	}
+
+	public void stop()
+	{
+		final IWorkbench workbench = PlatformUI.getWorkbench();
+		if (workbench == null)
+			return;
+		final Display display = workbench.getDisplay();
+		display.syncExec(new Runnable()
+		{
+			public void run()
+			{
+				if (!display.isDisposed())
+					workbench.close();
+			}
+		});
+	}
 }

Modified: org.escapek.client/trunk/src/org/escapek/client/repository/RepositoryCreator.java
===================================================================
--- org.escapek.client/trunk/src/org/escapek/client/repository/RepositoryCreator.java	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client/trunk/src/org/escapek/client/repository/RepositoryCreator.java	2007-02-15 20:44:49 UTC (rev 814)
@@ -33,8 +33,8 @@
 import java.util.Hashtable;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.jface.operation.IRunnableContext;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -102,7 +102,7 @@
 				public void done(IJobChangeEvent event)
 				{
 					if(!event.getResult().isOK())
-						Platform.getJobManager().cancel(EscapeKJob.JOB_FAMILY_REPOSITORY_CREATION);
+						Job.getJobManager().cancel(EscapeKJob.JOB_FAMILY_REPOSITORY_CREATION);
 				}
 			});
 		}
@@ -133,11 +133,11 @@
 							creationJobs[i].setProgressGroup(monitor, 1);
 							creationJobs[i].schedule();
 						}
-						Platform.getJobManager().join(EscapeKJob.JOB_FAMILY_REPOSITORY_CREATION, monitor);
+						Job.getJobManager().join(EscapeKJob.JOB_FAMILY_REPOSITORY_CREATION, monitor);
 					}
 					catch (InterruptedException e)
 					{
-						Platform.getJobManager().cancel(EscapeKJob.JOB_FAMILY_REPOSITORY_CREATION);
+						Job.getJobManager().cancel(EscapeKJob.JOB_FAMILY_REPOSITORY_CREATION);
 					}
 					finally
 					{

Added: org.escapek.client.cmdb/trunk/plugin.properties
===================================================================
--- org.escapek.client.cmdb/trunk/plugin.properties	                        (rev 0)
+++ org.escapek.client.cmdb/trunk/plugin.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -0,0 +1,123 @@
+#Properties
+AddressProperty.displayName=Address
+AddressProperty.description=Type used to stores physical addresses like street name, building, ...
+BooleanProperty.displayName=Boolean
+BooleanProperty.description=Used to store on/off , true/false values.
+IntegerProperty.displayName=Integer
+IntegerProperty.description=Integer value
+RegistryNodeProperty.displayName=Registry node
+RegistryNodeProperty.description=Registry node value
+DoubleProperty.displayName=Double
+DoubleProperty.description=Double decimal value
+StringProperty.displayName=String
+StringProperty.description=String value
+DateProperty.displayName=Date
+DateProperty.description=Date value
+
+#Relation Types
+InclusionRelationType.displayName=Inclusion
+InclusionRelationType.description=A relation type where a CI includes another
+
+#Relation classes
+ContainedLocation.displayName=Contained location
+ContainedLocation.description=Locations included into another
+
+#CI classes
+ConcreteJob.displayName=Concrete Job
+ConcreteJob.description=A concrete version of Job. This class represents a generic and instantiable unit of work, such as a batch or a print job.
+ConcreteJob.TimeOfLastStateChange.displayName=Time of last state change
+ConcreteJob.TimeOfLastStateChange.description=The date or time when the state of the Job last changed.
+ConcreteJob.JobState.displayName=Job state
+%ConcreteJob.JobState.description=JobState is an integer enumeration that indicates the operational state of a Job. It can also indicate transitions between these states, for example, 'Shutting Down' and 'Starting'.
+EnabledLogicalElement.displayName=Enabled logical element
+EnabledLogicalElement.description=This class extends LogicalElement to abstract the concept of an element that is enabled and disabled, such as a LogicalDevice or a ServiceAccessPoint.
+EnabledLogicalElement.TimeOfLastStateChange.displayName=Time of last state change
+EnabledLogicalElement.TimeOfLastStateChange.displayName=The date or time when the EnabledState of the element last changed.
+EnabledLogicalElement.OtherEnabledState.displayName=Other enabled state
+EnabledLogicalElement.OtherEnabledState.displayName A string that describes the enabled or disabled state of the element when the EnabledState property is set to 'Other'.
+EnabledLogicalelement.EnabledState.displayName=Enabled state
+EnabledLogicalelement.EnabledState.displayName=EnabledState indicates the enabled and disabled states of an element. It can also indicate the transitions between these requested states. For example, 'shutting down' 'starting' are transient states between enabled and disabled.
+EnabledLogicalElement.RequestedState.displayName=Requested state
+EnabledLogicalElement.RequestedState.description=RequestedState that indicates the last requested or desired state for the element. The actual state of the element is represented by EnabledState. This property is provided to compare the last requested and current enabled or disabled states. Note that when EnabledState is set to 5 'Not Applicable', then this property has no meaning. By default, the RequestedState of the element is 'No Change'. Refer to the EnabledState property description for explanations of the values in the RequestedState enumeration. 
+Job.displayName=Job
+Job.description=A Job is a LogicalElement that represents an executing unit of work, such as a script or a print job. A Job is distinct from a Process in that a Job can be scheduled or queued, and its execution is not limited to a single system.
+Job.UntilTime.displayName=Until time
+Job.UntilTime.description= The time after which the Job is invalid or should be stopped.
+Job.RunDay.displayName=Run day
+Job.RunDay.description=The day in the month on which the Job should be processed. There are two different interpretations for this property, depending on the value of DayOfWeek. In one case, RunDay defines the day-in-month on which the Job is processed. This interpretation is used when the DayOfWeek is 0. A positive or negative integer indicates whether the RunDay should be calculated from the beginning or end of the month. For example, 5 indicates the fifth day in the RunMonth and -1 indicates the last day in the RunMonth.\nWhen RunDayOfWeek is not 0, RunDay is the day-in-month on which the Job is processed, defined in conjunction with RunDayOfWeek. For example, if RunDay is 15 and RunDayOfWeek is Saturday, then the Job is processed on the first Saturday on or after the 15th day in the RunMonth (for example, the third Saturday in the month). If RunDay is 20 and RunDayOfWeek is -Saturday, then this indicates the first Saturday on or before the 20th day in the RunMonth. If RunDay is -1 and RunDayOfWeek is -Sunday, then this indicates the last Sunday in the RunMonth.
+Job.JobStatus.displayName=Job status
+Job.JobStatus.description= A free-form string that represents the status of the job. The primary status is reflected in the inherited OperationalStatus property. JobStatus provides additional, implementation-specific details.
+Job.DeleteOnCompletion.displayName=Delete on completion
+Job.DeleteOnCompletion.description=Indicates whether or not the job should be automatically deleted upon completion. Note that the 'completion' of a recurring job is defined by its JobRunTimes or UntilTime properties, or when the Job is terminated by manual intervention. If this property is set to false and the job completes, then the extrinsic method DeleteInstance must be used to delete the job instead of updating this property.
+Job.RunStartInterval.displayName=Run start interval
+Job.RunStartInterval.description=The time interval after midnight when the Job should be processed.
+Job.ErrorDescription.displayName=Error description
+Job.ErrorDescription.description=A free-form string that contains the vendor error description.
+Job.ErrorCode.displayName=Error code
+Job.ErrorCode.description= A vendor-specific error code. The value must be set to zero if the Job completed without error.
+Job.TimeSubmitted.displayName=Time submitted
+Job.TimeSubmitted.description=The time that the Job was submitted to execute.
+Job.OtherRecoveryAction.displayName=Other recovery action
+Job.OtherRecoveryAction.description=A string describing the recovery action when the RecoveryAction property of the instance is 'Other'.
+Job.RunMonth.displayName=Run month
+Job.RunMonth.description=The month during which the Job should be processed.
+Job.RunDayOfWeek.displayName=Run day of week
+Job.RunDayOfWeek.description=A positive or negative integer used in conjunction with RunDay to indicate the day of the week on which the Job is processed. RunDayOfWeek is set to 0 to indicate an exact day of the month, such as March 1. A positive integer (representing Sunday, Monday, ..., Saturday) means that the day of week is found on or after the specified RunDay. A negative integer (representing -Sunday, -Monday, ..., -Saturday) means that the day of week is found on or BEFORE the RunDay.
+Job.JobRunTimes.displayName=Job run times
+Job.JobRunTimes.description= The number of times that the Job should be run. A value of 1 indicates that the Job is not recurring, while any non-zero value indicates a limit to the number of times that the Job will recur. Zero indicates that there is no limit to the number of times that the Job can be processed, but that it is terminated either after the UntilTime or by manual intervention.
+Job.ElapsedTime.displayName=Elapsed time
+Job.ElapsedTime.description= The time interval that the Job has been executing or the total execution time if the Job is complete.
+Job.StartTime.displayName=Start time
+Job.StartTime.description= The time that the Job was actually started.
+Job.RecoveryAction.displayName=Recovery action
+Job.RecoveryAction.description=Describes the recovery action to be taken for an unsuccessfully run Job.
+Job.LocalOrUtcTime.displayName=Local or UTC time
+Job.LocalOrUtcTime.description=This property indicates whether the times represented in the RunStartInterval and UntilTime properties represent local times or UTC times. Time values are synchronized worldwide by using the enumeration value 2, 'UTC Time'.
+Job.PercentComplete.displayName=Percent complete
+Job.PercentComplete.description=The percentage of the job that has completed at the time that this value is requested.
+Job.Priority.displayName=Priority
+Job.Priority.description=Indicates the urgency or importance of execution of the Job. The lower the number, the higher the priority.
+Location.displayName=Location
+Location.description=The Location class specifies the position and address of a PhysicalElement.
+Location.physicalLocation.displayName=Physical location
+Location.physicalLocation.description= Position is a free-form string that indicates the placement of a PhysicalElement. It can specify slot information on a HostingBoard, mounting site in a Cabinet, or latitude and longitude information, for example, from a GPS. It is part of the key of the Location object.
+Location.address.displayName=Address
+Location.address.description= Address indicates a street, building, or other type of address for the location of the PhysicalElement.
+LogicalElement.description=Logical element
+LogicalElement.description=LogicalElement is a base class for all the components of a System that represent abstract system components, such as Files, Processes, or LogicalDevices.
+ManagedSystemElement.displayName=Managed System element
+ManagedSystemElement.description=ManagedSystem is the base class for the System Element hierarchy. Any distinguishable component of a System is a candidate for inclusion in this class. Examples of system components include:\n- software components such as application servers, databases, and applications\n- operating system components such as files, processes, and threads\n- device components such as disk drives, controllers, processors, and printers\n- physical components such as chips and cards.
+ManagedSystemElement.installDate.displayName=Installation date
+ManagedSystemElement.installDate.description=Date indicating when the object was installed.
+ManagedSystemElement.statusDescription.diplayName=Status description
+ManagedSystemElement.statusDescription.description=String describing the the operational status.
+ManagedSystemElement.healthState.displayName=Health state
+ManagedSystemElement.healthState.description=Indicates the current health of the element. This attribute expresses the health of this element but not necessarily that of its subcomponents.
+ManagedSystemElement.operationalStatus.displayName=Operational status
+ManagedSystemElement.operationalStatus.description=Operational status of the element.
+PhysicalElement.displayName=Physical element
+PhysicalElement.description=Physical element define any component of a System that has a distinct physical identity. Instances of this class can be defined as an object that can be seen or touched. All Processes, Files, and LogicalDevices are considered not to be Physical Elements. For example, it is not possible to touch the functionality of a 'modem.' You can touch only the card or package that implements the modem. The same card could also implement a LAN adapter. PhysicalElements are tangible ManagedSystemElements that have a physical manifestation of some sort.
+PhysicalElement.vendorEquipmentType.displayName=Vendor equipement type
+PhysicalElement.vendorEquipmentType.description=Vendor-specific hardware type for the PhysicalElement. It describes the specific equipment type for the element, as defined by the vendor or manufacturer.
+PhysicalElement.model.displayName=Model
+PhysicalElement.model.description=The name by which the PhysicalElement is generally known.
+PhysicalElement.partNumber.displayName=Part number
+PhysicalElement.partNumber.description=The part number assigned by the organization that is responsible for producing or manufacturing the PhysicalElement.
+PhysicalElement.poweredOn.displayName=Powered on
+PhysicalElement.poweredOn.description=Boolean that indicates whether the PhysicalElement is powered on or is currently off.
+PhysicalElement.otherIdentifyingInfo.displayName=Other identifying information
+PhysicalElement.otherIdentifyingInfo.description=This information could be used to identify a Physical Element. One example is bar code data associated with an Element that also has an asset tag.
+PhysicalElement.serialNumber.displayName=Serial number
+PhysicalElement.serialNumber.description=A manufacturer-allocated number used to identify the Physical Element.
+PhysicalElement.userTracking.displayName=User tracking
+PhysicalElement.userTracking.description=User-assigned and writeable asset-tracking identifier for the PhysicalElement.
+PhysicalElement.manufactureDate.displayName=Manufacture date
+PhysicalElement.manufactureDate.description=The date that this PhysicalElement was manufactured.
+PhysicalElement.SKU.displayName=SKU
+PhysicalElement.SKU.description=The stock-keeping unit number for this PhysicalElement.
+PhysicalElement.PhysicalElementLocation.displayName=Physical element location
+PhysicalElement.PhysicalElementLocation.displayName=The physical location of the PhysicalElement.
+Service.displayName=Service
+Service.description=A Service is a Logical Element that contains the information that is necessary to represent and manage the functionality provided by a Device or a SoftwareFeature, or both. A Service is a general-purpose object that is used to configure and manage the implementation of functionality. It is not the functionality itself.
+Service.Started.displayName=Started
+Service.Started.description= Started is a Boolean that indicates whether the Service has been started (TRUE), or stopped (FALSE).

Modified: org.escapek.client.cmdb.en/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.client.cmdb.en/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.cmdb.en/trunk/META-INF/MANIFEST.MF	2007-02-15 20:44:49 UTC (rev 814)
@@ -4,4 +4,3 @@
 Bundle-SymbolicName: org.escapek.client.cmdb.en
 Bundle-Version: 1.0.0
 Fragment-Host: org.escapek.client.cmdb;bundle-version="1.0.0"
-Bundle-Localization: plugin

Deleted: org.escapek.client.cmdb.en/trunk/plugin_en.properties
===================================================================
--- org.escapek.client.cmdb.en/trunk/plugin_en.properties	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.cmdb.en/trunk/plugin_en.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,123 +0,0 @@
-#Properties
-AddressProperty.displayName=Address
-AddressProperty.description=Type used to stores physical addresses like street name, building, ...
-BooleanProperty.displayName=Boolean
-BooleanProperty.description=Used to store on/off , true/false values.
-IntegerProperty.displayName=Integer
-IntegerProperty.description=Integer value
-RegistryNodeProperty.displayName=Registry node
-RegistryNodeProperty.description=Registry node value
-DoubleProperty.displayName=Double
-DoubleProperty.description=Double decimal value
-StringProperty.displayName=String
-StringProperty.description=String value
-DateProperty.displayName=Date
-DateProperty.description=Date value
-
-#Relation Types
-InclusionRelationType.displayName=Inclusion
-InclusionRelationType.description=A relation type where a CI includes another
-
-#Relation classes
-ContainedLocation.displayName=Contained location
-ContainedLocation.description=Locations included into another
-
-#CI classes
-ConcreteJob.displayName=Concrete Job
-ConcreteJob.description=A concrete version of Job. This class represents a generic and instantiable unit of work, such as a batch or a print job.
-ConcreteJob.TimeOfLastStateChange.displayName=Time of last state change
-ConcreteJob.TimeOfLastStateChange.description=The date or time when the state of the Job last changed.
-ConcreteJob.JobState.displayName=Job state
-%ConcreteJob.JobState.description=JobState is an integer enumeration that indicates the operational state of a Job. It can also indicate transitions between these states, for example, 'Shutting Down' and 'Starting'.
-EnabledLogicalElement.displayName=Enabled logical element
-EnabledLogicalElement.description=This class extends LogicalElement to abstract the concept of an element that is enabled and disabled, such as a LogicalDevice or a ServiceAccessPoint.
-EnabledLogicalElement.TimeOfLastStateChange.displayName=Time of last state change
-EnabledLogicalElement.TimeOfLastStateChange.displayName=The date or time when the EnabledState of the element last changed.
-EnabledLogicalElement.OtherEnabledState.displayName=Other enabled state
-EnabledLogicalElement.OtherEnabledState.displayName A string that describes the enabled or disabled state of the element when the EnabledState property is set to 'Other'.
-EnabledLogicalelement.EnabledState.displayName=Enabled state
-EnabledLogicalelement.EnabledState.displayName=EnabledState indicates the enabled and disabled states of an element. It can also indicate the transitions between these requested states. For example, 'shutting down' 'starting' are transient states between enabled and disabled.
-EnabledLogicalElement.RequestedState.displayName=Requested state
-EnabledLogicalElement.RequestedState.description=RequestedState that indicates the last requested or desired state for the element. The actual state of the element is represented by EnabledState. This property is provided to compare the last requested and current enabled or disabled states. Note that when EnabledState is set to 5 'Not Applicable', then this property has no meaning. By default, the RequestedState of the element is 'No Change'. Refer to the EnabledState property description for explanations of the values in the RequestedState enumeration. 
-Job.displayName=Job
-Job.description=A Job is a LogicalElement that represents an executing unit of work, such as a script or a print job. A Job is distinct from a Process in that a Job can be scheduled or queued, and its execution is not limited to a single system.
-Job.UntilTime.displayName=Until time
-Job.UntilTime.description= The time after which the Job is invalid or should be stopped.
-Job.RunDay.displayName=Run day
-Job.RunDay.description=The day in the month on which the Job should be processed. There are two different interpretations for this property, depending on the value of DayOfWeek. In one case, RunDay defines the day-in-month on which the Job is processed. This interpretation is used when the DayOfWeek is 0. A positive or negative integer indicates whether the RunDay should be calculated from the beginning or end of the month. For example, 5 indicates the fifth day in the RunMonth and -1 indicates the last day in the RunMonth.\nWhen RunDayOfWeek is not 0, RunDay is the day-in-month on which the Job is processed, defined in conjunction with RunDayOfWeek. For example, if RunDay is 15 and RunDayOfWeek is Saturday, then the Job is processed on the first Saturday on or after the 15th day in the RunMonth (for example, the third Saturday in the month). If RunDay is 20 and RunDayOfWeek is -Saturday, then this indicates the first Saturday on or before the 20th day in the RunMonth. If RunDay is -1 and RunDayOfWeek is -Sunday, then this indicates the last Sunday in the RunMonth.
-Job.JobStatus.displayName=Job status
-Job.JobStatus.description= A free-form string that represents the status of the job. The primary status is reflected in the inherited OperationalStatus property. JobStatus provides additional, implementation-specific details.
-Job.DeleteOnCompletion.displayName=Delete on completion
-Job.DeleteOnCompletion.description=Indicates whether or not the job should be automatically deleted upon completion. Note that the 'completion' of a recurring job is defined by its JobRunTimes or UntilTime properties, or when the Job is terminated by manual intervention. If this property is set to false and the job completes, then the extrinsic method DeleteInstance must be used to delete the job instead of updating this property.
-Job.RunStartInterval.displayName=Run start interval
-Job.RunStartInterval.description=The time interval after midnight when the Job should be processed.
-Job.ErrorDescription.displayName=Error description
-Job.ErrorDescription.description=A free-form string that contains the vendor error description.
-Job.ErrorCode.displayName=Error code
-Job.ErrorCode.description= A vendor-specific error code. The value must be set to zero if the Job completed without error.
-Job.TimeSubmitted.displayName=Time submitted
-Job.TimeSubmitted.description=The time that the Job was submitted to execute.
-Job.OtherRecoveryAction.displayName=Other recovery action
-Job.OtherRecoveryAction.description=A string describing the recovery action when the RecoveryAction property of the instance is 'Other'.
-Job.RunMonth.displayName=Run month
-Job.RunMonth.description=The month during which the Job should be processed.
-Job.RunDayOfWeek.displayName=Run day of week
-Job.RunDayOfWeek.description=A positive or negative integer used in conjunction with RunDay to indicate the day of the week on which the Job is processed. RunDayOfWeek is set to 0 to indicate an exact day of the month, such as March 1. A positive integer (representing Sunday, Monday, ..., Saturday) means that the day of week is found on or after the specified RunDay. A negative integer (representing -Sunday, -Monday, ..., -Saturday) means that the day of week is found on or BEFORE the RunDay.
-Job.JobRunTimes.displayName=Job run times
-Job.JobRunTimes.description= The number of times that the Job should be run. A value of 1 indicates that the Job is not recurring, while any non-zero value indicates a limit to the number of times that the Job will recur. Zero indicates that there is no limit to the number of times that the Job can be processed, but that it is terminated either after the UntilTime or by manual intervention.
-Job.ElapsedTime.displayName=Elapsed time
-Job.ElapsedTime.description= The time interval that the Job has been executing or the total execution time if the Job is complete.
-Job.StartTime.displayName=Start time
-Job.StartTime.description= The time that the Job was actually started.
-Job.RecoveryAction.displayName=Recovery action
-Job.RecoveryAction.description=Describes the recovery action to be taken for an unsuccessfully run Job.
-Job.LocalOrUtcTime.displayName=Local or UTC time
-Job.LocalOrUtcTime.description=This property indicates whether the times represented in the RunStartInterval and UntilTime properties represent local times or UTC times. Time values are synchronized worldwide by using the enumeration value 2, 'UTC Time'.
-Job.PercentComplete.displayName=Percent complete
-Job.PercentComplete.description=The percentage of the job that has completed at the time that this value is requested.
-Job.Priority.displayName=Priority
-Job.Priority.description=Indicates the urgency or importance of execution of the Job. The lower the number, the higher the priority.
-Location.displayName=Location
-Location.description=The Location class specifies the position and address of a PhysicalElement.
-Location.physicalLocation.displayName=Physical location
-Location.physicalLocation.description= Position is a free-form string that indicates the placement of a PhysicalElement. It can specify slot information on a HostingBoard, mounting site in a Cabinet, or latitude and longitude information, for example, from a GPS. It is part of the key of the Location object.
-Location.address.displayName=Address
-Location.address.description= Address indicates a street, building, or other type of address for the location of the PhysicalElement.
-LogicalElement.description=Logical element
-LogicalElement.description=LogicalElement is a base class for all the components of a System that represent abstract system components, such as Files, Processes, or LogicalDevices.
-ManagedSystemElement.displayName=Managed System element
-ManagedSystemElement.description=ManagedSystem is the base class for the System Element hierarchy. Any distinguishable component of a System is a candidate for inclusion in this class. Examples of system components include:\n- software components such as application servers, databases, and applications\n- operating system components such as files, processes, and threads\n- device components such as disk drives, controllers, processors, and printers\n- physical components such as chips and cards.
-ManagedSystemElement.installDate.displayName=Installation date
-ManagedSystemElement.installDate.description=Date indicating when the object was installed.
-ManagedSystemElement.statusDescription.diplayName=Status description
-ManagedSystemElement.statusDescription.description=String describing the the operational status.
-ManagedSystemElement.healthState.displayName=Health state
-ManagedSystemElement.healthState.description=Indicates the current health of the element. This attribute expresses the health of this element but not necessarily that of its subcomponents.
-ManagedSystemElement.operationalStatus.displayName=Operational status
-ManagedSystemElement.operationalStatus.description=Operational status of the element.
-PhysicalElement.displayName=Physical element
-PhysicalElement.description=Physical element define any component of a System that has a distinct physical identity. Instances of this class can be defined as an object that can be seen or touched. All Processes, Files, and LogicalDevices are considered not to be Physical Elements. For example, it is not possible to touch the functionality of a 'modem.' You can touch only the card or package that implements the modem. The same card could also implement a LAN adapter. PhysicalElements are tangible ManagedSystemElements that have a physical manifestation of some sort.
-PhysicalElement.vendorEquipmentType.displayName=Vendor equipement type
-PhysicalElement.vendorEquipmentType.description=Vendor-specific hardware type for the PhysicalElement. It describes the specific equipment type for the element, as defined by the vendor or manufacturer.
-PhysicalElement.model.displayName=Model
-PhysicalElement.model.description=The name by which the PhysicalElement is generally known.
-PhysicalElement.partNumber.displayName=Part number
-PhysicalElement.partNumber.description=The part number assigned by the organization that is responsible for producing or manufacturing the PhysicalElement.
-PhysicalElement.poweredOn.displayName=Powered on
-PhysicalElement.poweredOn.description=Boolean that indicates whether the PhysicalElement is powered on or is currently off.
-PhysicalElement.otherIdentifyingInfo.displayName=Other identifying information
-PhysicalElement.otherIdentifyingInfo.description=This information could be used to identify a Physical Element. One example is bar code data associated with an Element that also has an asset tag.
-PhysicalElement.serialNumber.displayName=Serial number
-PhysicalElement.serialNumber.description=A manufacturer-allocated number used to identify the Physical Element.
-PhysicalElement.userTracking.displayName=User tracking
-PhysicalElement.userTracking.description=User-assigned and writeable asset-tracking identifier for the PhysicalElement.
-PhysicalElement.manufactureDate.displayName=Manufacture date
-PhysicalElement.manufactureDate.description=The date that this PhysicalElement was manufactured.
-PhysicalElement.SKU.displayName=SKU
-PhysicalElement.SKU.description=The stock-keeping unit number for this PhysicalElement.
-PhysicalElement.PhysicalElementLocation.displayName=Physical element location
-PhysicalElement.PhysicalElementLocation.displayName=The physical location of the PhysicalElement.
-Service.displayName=Service
-Service.description=A Service is a Logical Element that contains the information that is necessary to represent and manage the functionality provided by a Device or a SoftwareFeature, or both. A Service is a general-purpose object that is used to configure and manage the implementation of functionality. It is not the functionality itself.
-Service.Started.displayName=Started
-Service.Started.description= Started is a Boolean that indicates whether the Service has been started (TRUE), or stopped (FALSE).

Modified: org.escapek.client.core/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.client.core/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.core/trunk/META-INF/MANIFEST.MF	2007-02-15 20:44:49 UTC (rev 814)
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.escapek.client.core;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.escapek.client.core.CoreActivator
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.escapek.server,

Modified: org.escapek.client.core/trunk/src/org/escapek/client/core/ui/databinding/DataBindingContextFactory.java
===================================================================
--- org.escapek.client.core/trunk/src/org/escapek/client/core/ui/databinding/DataBindingContextFactory.java	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.core/trunk/src/org/escapek/client/core/ui/databinding/DataBindingContextFactory.java	2007-02-15 20:44:49 UTC (rev 814)
@@ -41,7 +41,6 @@
 {
 	public static DataBindingContext create()
 	{
-		Realm.setDefault(SWTObservables.getRealm(Display.getDefault()));
 		DataBindingContext bindingContext = new DataBindingContext();
 		return bindingContext;
 	}

Modified: org.escapek.client.tools/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.client.tools/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.tools/trunk/META-INF/MANIFEST.MF	2007-02-15 20:44:49 UTC (rev 814)
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.escapek.client.tools
 Bundle-Version: 1.0.0
 Bundle-Activator: org.escapek.client.tools.Activator
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.escapek.preferences,

Added: org.escapek.client.ui/trunk/plugin.properties
===================================================================
--- org.escapek.client.ui/trunk/plugin.properties	                        (rev 0)
+++ org.escapek.client.ui/trunk/plugin.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -0,0 +1,4 @@
+DescriptionTab.name=Description
+GeneralTab.name=General
+NotesTab.name=Notes
+AccessRightsTab.name=Access rights
\ No newline at end of file

Modified: org.escapek.client.ui/trunk/src/org/escapek/client/ui/tools/FormTools.java
===================================================================
--- org.escapek.client.ui/trunk/src/org/escapek/client/ui/tools/FormTools.java	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui/trunk/src/org/escapek/client/ui/tools/FormTools.java	2007-02-15 20:44:49 UTC (rev 814)
@@ -31,7 +31,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.forms.FormColors;
+import org.eclipse.ui.forms.IFormColors;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 /**
@@ -44,7 +44,7 @@
 	public static Label createLabel(Composite parent, FormToolkit toolkit, String text)
 	{
 		Label label = toolkit.createLabel(parent, text);
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
+		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 		label.setLayoutData(createLabelGridData());
 		return label;
 	}
@@ -52,7 +52,7 @@
 	public static Label createLabel(Composite parent, FormToolkit toolkit, String text, GridData gd)
 	{
 		Label label = toolkit.createLabel(parent, text);
-		label.setForeground(toolkit.getColors().getColor(FormColors.TITLE));
+		label.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
 		label.setLayoutData(gd);
 		return label;
 	}

Added: org.escapek.client.ui.cmdb/trunk/plugin.properties
===================================================================
--- org.escapek.client.ui.cmdb/trunk/plugin.properties	                        (rev 0)
+++ org.escapek.client.ui.cmdb/trunk/plugin.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -0,0 +1,6 @@
+PrimarySiteGroup.name=Primary sites
+NewLocationWizard.name=Location
+CMDBCategory.name=Repository objects
+AllSitesGroup.name=All sites
+LinkedSitesGroup.name=Linked sites
+NewCIClassWizard.name=CI class

Modified: org.escapek.client.ui.cmdb/trunk/src/org/escapek/client/ui/cmdb/providers/ContactContentProvider.java
===================================================================
--- org.escapek.client.ui.cmdb/trunk/src/org/escapek/client/ui/cmdb/providers/ContactContentProvider.java	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.cmdb/trunk/src/org/escapek/client/ui/cmdb/providers/ContactContentProvider.java	2007-02-15 20:44:49 UTC (rev 814)
@@ -54,6 +54,7 @@
 		return null;
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public Collection loadChildren(Object parent)
 	{

Modified: org.escapek.client.ui.cmdb.en/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.client.ui.cmdb.en/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.cmdb.en/trunk/META-INF/MANIFEST.MF	2007-02-15 20:44:49 UTC (rev 814)
@@ -4,4 +4,3 @@
 Bundle-SymbolicName: org.escapek.client.ui.cmdb.en
 Bundle-Version: 1.0.0
 Fragment-Host: org.escapek.client.ui.cmdb;bundle-version="1.0.0"
-Bundle-Localization: plugin

Modified: org.escapek.client.ui.cmdb.en/trunk/build.properties
===================================================================
--- org.escapek.client.ui.cmdb.en/trunk/build.properties	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.cmdb.en/trunk/build.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,2 +1 @@
-bin.includes = META-INF/,\
-               plugin_en.properties
+bin.includes = META-INF/

Deleted: org.escapek.client.ui.cmdb.en/trunk/plugin_en.properties
===================================================================
--- org.escapek.client.ui.cmdb.en/trunk/plugin_en.properties	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.cmdb.en/trunk/plugin_en.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,6 +0,0 @@
-PrimarySiteGroup.name=Primary sites
-NewLocationWizard.name=Location
-CMDBCategory.name=Repository objects
-AllSitesGroup.name=All sites
-LinkedSitesGroup.name=Linked sites
-NewCIClassWizard.name=CI class

Modified: org.escapek.client.ui.en/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.client.ui.en/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.en/trunk/META-INF/MANIFEST.MF	2007-02-15 20:44:49 UTC (rev 814)
@@ -4,4 +4,3 @@
 Bundle-SymbolicName: org.escapek.client.ui.en
 Bundle-Version: 1.0.0
 Fragment-Host: org.escapek.client.ui;bundle-version="1.0.0"
-Bundle-Localization: plugin

Modified: org.escapek.client.ui.en/trunk/build.properties
===================================================================
--- org.escapek.client.ui.en/trunk/build.properties	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.en/trunk/build.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,2 +1 @@
-bin.includes = META-INF/,\
-               plugin_en.properties
+bin.includes = META-INF/

Deleted: org.escapek.client.ui.en/trunk/plugin_en.properties
===================================================================
--- org.escapek.client.ui.en/trunk/plugin_en.properties	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.en/trunk/plugin_en.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,4 +0,0 @@
-DescriptionTab.name=Description
-GeneralTab.name=General
-NotesTab.name=Notes
-AccessRightsTab.name=Access rights
\ No newline at end of file

Added: org.escapek.client.ui.security/trunk/plugin.properties
===================================================================
--- org.escapek.client.ui.security/trunk/plugin.properties	                        (rev 0)
+++ org.escapek.client.ui.security/trunk/plugin.properties	2007-02-15 20:44:49 UTC (rev 814)
@@ -0,0 +1,8 @@
+RoleEditor.name=Role editor
+RoleView.name=Roles
+NewRoleWizard.name=Role
+NewUserWizard.name=User
+SecurityCategory.name=Security
+SecurityPerspective.name=Security
+UserEditor.name=User editor
+UserView.name=Users
\ No newline at end of file

Modified: org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java
===================================================================
--- org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java	2007-02-15 20:42:53 UTC (rev 813)
+++ org.escapek.client.ui.security/trunk/src/org/escapek/client/ui/security/editors/forms/RoleMainFormPage.java	2007-02-15 20:44:49 UTC (rev 814)
@@ -1,321 +1,379 @@
-/**
- * Escape-K
- * Copyright (C) 2006 Nicolas Jouanin, and individual contributors 
- * as indicated by the @authors tag. See copyright.txt in the
- * distribution for a full listing of individual contributors.
- * Contact: es...@gm...
- *
- * This file is part of Escape-K.
- * 
- * Escape-K is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Escape-K is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Foobar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * --------------------------------------------------------------------------
- * $Id$
- * --------------------------------------------------------------------------
- */
-package org.escapek.client.ui.security.editors.forms;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.databinding.BindingEvent;
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.IBindingListener;
-import org.eclipse.core.databinding.beans.BeansObservables;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.map.IObservableMap;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.databinding.swt.SWTObservables;
-import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormEditor;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.escapek.client.core.services.ObjectChangeService;
-import org.escapek.client.core.ui.EscapeKFormPage;
-import org.escapek.client.core.ui.databinding.DataBindingContextFactory;
-import org.escapek.client.ui.security.SecurityActivator;
-import org.escapek.client.ui.security.editors.RoleEditorInput;
-import org.escapek.client.ui.security.editors.forms.providers.RoleGrantedUserLabelProvider;
-import org.escapek.client.ui.tools.FormTools;
-import org.escapek.core.dto.security.RoleDTO;
-import org.escapek.core.dto.security.TicketDTO;
-import org.escapek.core.dto.security.UserDTO;
-import org.escapek.core.exceptions.EntityNotFoundException;
-import org.escapek.core.exceptions.SecurityException;
-import org.escapek.core.serviceManager.ServiceWrapper;
-import org.escapek.core.serviceManager.Exceptions.ConnectionException;
-import org.escapek.core.services.interfaces.IRemoteSecurityService;
-import org.escapek.i18n.LocaleService;
-import org.escapek.i18n.MessageService;
-import org.escapek.logger.LoggerPlugin;
-import org.escapek.logger.LoggingConstants;
-
-/**
- * 
- * @author nicolasjouanin
- *
- */
-public class RoleMainFormPage extends EscapeKFormPage
-	implements IBindingListener
-{
-	private RoleDTO editedRole;
-	private List<UserDTO> userList;
-	private FormToolkit toolkit;
-	private String title;
-	private Text nameText;
-	private Text descText;
-	private TableViewer userViewer;
-	private Button addUserButton;
-	private Button delUserButton;
-	private boolean dirty;
-	private DataBindingContext bindingContext;
-
-	private MessageService message;
-	private MessageService commonMessages;
-	
-	private IRemoteSecurityService securityService;
-
-	public RoleMainFormPage(FormEditor editor, String id, String title)
-	{
-		super(editor, id, title);
-		this.title = title;
-		message = LocaleService.getMessageService(LocaleService.uiMessages);
-		commonMessages = LocaleService.getMessageService(LocaleService.commonMessages);
-
-		dirty = false;
-		editedRole = ((RoleEditorInput)(editor.getEditorInput())).getRole();
-		userList = new ArrayList<UserDTO>();
-		
-		try
-		{
-			securityService = ServiceWrapper.getInstance().getSecurityService();
-		}
-		catch (ConnectionException e)
-		{
-			//This exception should have already been tested
-			LoggerPlugin.LogWarning(SecurityActivator.PLUGIN_ID, LoggingConstants.UNEXPECTED_EXCEPTION, 
-				"Couldn't get Security service", e);
-		}
-	}
-	
-	@Override
-	protected void createFormContent(IManagedForm managedForm)
-	{
-		toolkit = managedForm.getToolkit();
-		TableWrapLayout layout = new TableWrapLayout();
-		layout.numColumns = 2;
-		managedForm.getForm().getBody().setLayout(layout);
-		managedForm.getForm().setText(this.title);
-
-		createMainSection(managedForm);
-		createGrantedUserSection(managedForm);
-
-		//Data binding
-		bindGUI();
-	}
-	
-	private void createMainSection(IManagedForm managedForm)
-	{
-		GridData data = new GridData();
-		Section dataSection = toolkit.createSection(managedForm.getForm().getBody(),
-				Section.TITLE_BAR|Section.EXPANDED);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.colspan = 2;
-		dataSection.setLayoutData(td);
-		dataSection.setText(message.getString("roleEditor.mainForm.dataSection.title"));
-		
-		Composite sectionClient = toolkit.createComposite(dataSection);
-		GridLayout clientLayout = new GridLayout();
-		clientLayout.numColumns = 2;
-		sectionClient.setLayout(clientLayout);
-
-		//Id
-		FormTools.createLabel(sectionClient, toolkit, commonMessages.getString("common.repId.label"));
-		Text idText = toolkit.createText(sectionClient, "", SWT.BORDER | SWT.READ_ONLY);
-		idText.setText(editedRole.getId().toString());
-		idText.setEditable(false);
-		data = new GridData(SWT.LEFT, SWT.FILL, false, false);
-		idText.setLayoutData(data);
-
-		//Name
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		FormTools.createLabel(sectionClient, toolkit, message.getString("roleEditor.mainForm.dataSection.name.label"), data);
-		nameText = toolkit.createText(sectionClient, "", SWT.BORDER);
-		data = new GridData(SWT.FILL, SWT.FILL, true, false);
-		nameText.setLayoutData(data);
-
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		FormTools.createLabel(sectionClient, toolkit, commonMessages.getString("common.description.label"), data);
-		
-		//Description
-		descText = toolkit.createText(sectionClient, "", SWT.MULTI);
-		descText.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
-		data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.heightHint = 50;
-		descText.setLayoutData(data);
-
-		toolkit.paintBordersFor(dataSection);
-		dataSection.setClient(sectionClient);
-		
-	}
-
-	private void createGrantedUserSection(IManagedForm managedForm)
-	{
-		GridData data = new GridData();
-		Section section = toolkit.createSection(managedForm.getForm().getBody(),
-				Section.TITLE_BAR|Section.EXPANDED);
-		TableWrapData td = new TableWrapData(TableWrapData.FILL_GRAB);
-		td.colspan = 2;
-		section.setLayoutData(td);
-		section.setText(message.getString("roleEditor.mainForm.grantedUserSection.title"));
-		
-		Composite sectionClient = toolkit.createComposite(section);
-		GridLayout clientLayout = new GridLayout();
-		clientLayout.numColumns = 2;
-		sectionClient.setLayout(clientLayout);
-
-		Table memberTable = toolkit.createTable(sectionClient, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
-		TableColumn loginColumn = new TableColumn(memberTable, SWT.LEFT);
-		loginColumn.setText(commonMessages.getString("common.login.columnText"));
-		loginColumn.setWidth(100);
-		memberTable.setHeaderVisible(true);
-		TableColumn descColumn = new TableColumn(memberTable, SWT.LEFT);
-		descColumn.setText(commonMessages.getString("common.desc.columnText"));
-		descColumn.setWidth(400);
-		data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		data.heightHint = 200;
-		data.verticalSpan = 2;
-		memberTable.setLayoutData(data);
-		userViewer = new TableViewer(memberTable);
-
-		addUserButton = toolkit.createButton(sectionClient, 
-			commonMessages.getString("common.addButton.text"), SWT.NONE);
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		addUserButton.setLayoutData(data);
-		delUserButton = toolkit.createButton(sectionClient, 
-			commonMessages.getString("common.delButton.text"), SWT.NONE);
-		data = new GridData(SWT.FILL, SWT.TOP, false, false);
-		delUserButton.setLayoutData(data);
-		toolkit.paintBordersFor(section);
-		section.setClient(sectionClient);
-	}
-
-	protected void bindGUI()
-	{
-		bindingContext = DataBindingContextFactory.create();
-		bindingContext.bindValue(SWTObservables.observeText(nameText, SWT.Modify),
-				BeansObservables.observeValue(editedRole, "name"), null);
-		bindingContext.bindValue(SWTObservables.observeText(descText, SWT.Modify),
-				BeansObservables.observeValue(editedRole, "description"), null);
-		
-		//Tables Binding
-		ObservableListContentProvider memberViewerContentProvider = new ObservableListContentProvider();
-		userViewer.setContentProvider(memberViewerContentProvider);
-		IObservableMap[] attributeMaps = BeansObservables.observeMaps(
-			memberViewerContentProvider.getKnownElements(), UserDTO.class,
-			new String[] { "loginString" ,"description"});
-		userViewer.setLabelProvider(new RoleGrantedUserLabelProvider(attributeMaps));
-
-		try
-		{
-			TicketDTO ticket = ServiceWrapper.getInstance().getTicket();
-			Collection<UserDTO> users = securityService.getRoleGrantedUsers(ticket.getId(), editedRole.getId());
-			if(users != null)
-				userList.addAll(users);
-			userViewer.setInput(new WritableList(SWTObservables.getRealm(Display.getDefault()), userList, UserDTO.class));
-		}
-		catch(SecurityException e)
-		{
-			
-		}
-		//Modification listener
-		bindingContext.addBindingEventListener(this);
-	}
-
-	public IStatus bindingEvent(BindingEvent e)
-	{
-		if(e.copyType == BindingEvent.EVENT_COPY_TO_MODEL &&
-			e.pipelinePosition == BindingEvent.PIPELINE_AFTER_GET &&
-			!dirty)
-		{
-			dirty = true;
-			firePropertyChange(PROP_DIRTY);
-		}
-		return Status.OK_STATUS;
-	}
-
-	@Override
-	public void doSave(IProgressMonitor monitor)
-	{
-		monitor.beginTask(message.getString("roleEditor.info.saveInProgress"), 3);
-		bindingContext.updateModels();
-		monitor.worked(1);
-		try
-		{
-			IRemoteSecurityService security = ServiceWrapper.getInstance().getSecurityService();
-			TicketDTO ticket = ServiceWrapper.getInstance().getTicket();
-			RoleDTO updatedRole = security.updateRole(ticket.getId(), editedRole);
-			monitor.worked(1);
-			editedRole.setName(updatedRole.getName());
-			editedRole.setDescription(updatedRole.getDescription());
-			bindingContext.updateTargets();
-			monitor.worked(1);
-		}
-		catch (ConnectionException e)
-		{
-			monitor.setCanceled(true);
-		}
-		catch (EntityNotFoundException e)
-		{
-			monitor.setCanceled(true);
-		}
-		catch (SecurityException e)
-		{
-			monitor.setCanceled(true);
-			//TODO : manage it
-		}
-		monitor.done();
-		ObjectChangeService.getInstance().fireObjectChanged(editedRole);
-	}
-
-	@Override
-	public boolean isDirty()
-	{
-		return dirty;
-	}
-
-	@Override
-	public void dispose()
-	{
-		editedRole = null;
-		super.dispose();
-	}
-}
+/**
+ * Escape-K
+ * Copyright (C) 2006 Nicolas Jouanin, and individual contributors 
+ * as indicated by the @authors tag. See copyright.txt in the
+ * distribution for a full listing of individual contributors.
+ * Contact: es...@gm...
+ *
+ * This file is part of Escape-K.
+ * 
+ * Escape-K is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escape-K is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Foobar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * --------------------------------------------------------------------------
+ * $Id$
+ * --------------------------------------------------------------------------
+ */
+package org.escapek.client.ui.security.editors.forms;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.core.databinding.BindingEvent;
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.IBindingListener;
+import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.observable.list.WritableList;
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.TableWrapData;
+import org.eclipse.ui.forms.widgets.TableWrapLayout;
+import org.escapek.client.core.services.ObjectChangeService;
+import org.escapek.client.core.ui.EscapeKFormPage;
+import org.escapek.client.core.ui.databinding.DataBindingContextFactory;
+import org.escapek.client.ui.security.SecurityActivator;
+import org.escapek.client.ui.security.editors.RoleEditorInput;
+import org.escapek.client.ui.security.editors.forms.providers.ObservableUserLabelProvider;
+import org.escapek.client.ui.tools.FormTools;
+import org.escapek.core.dto.security.RoleDTO;
+import org.escapek.core.dto.security.TicketDTO;
+import org.escapek.core.dto.security.UserDTO;
+import org.escapek.core.exceptions.EntityNotFoundException;
+import org.escapek.core.exceptions.SecurityException;
+import org.escapek.core.serviceManager.ServiceWrapper;
+import org.escapek.core.serviceManager.Exceptions.ConnectionException;
+import org.escapek.core.services.interfaces.IRemoteSecurityService;
+import org.escapek.i18n.LocaleService;
+import org.escapek.i18n.MessageService;
+import org.escapek.logger.LoggerPlugin;
+import org.escapek.logger.LoggingConstants;
+
+/**
+ * 
+ * @author nicolasjouanin
+ *
+ */
+public class RoleMainFormPage extends EscapeKFormPage
+	implements IBindingListener
+{
+	private RoleDTO editedRole;
+	private List<UserDTO> userList;
+	private List<RoleDTO> roleList;
+	private FormToolkit toolkit;
+	private String title;
+	private Text nameText;
+	private Text descText;
+	private TableViewer userViewer;
+	private TableViewer roleViewer;
+	private Button addUserButton;
+	private Button delUserButton;
+	private Button addRoleButton;
+	private Button delRoleButton;
+	private boolean dirty;
+	private DataBindingContext bindingContext;
+
+	private MessageService message;
+	private MessageService commonMessages;
+	
+	private IRemoteSecurityService securityService;
+
+	public RoleMainFormPage(FormEditor editor, String id, String title)
+	{
+		super(editor, id, title);
+		this.title = title;
+		message = LocaleService.getMessageService(LocaleService.uiMessages);
+		commonMessages = LocaleService.getMessageService(LocaleService.commonMessages);
+
+		dirty = false;
+		editedRole = ((RoleEditorInput)(editor.getEditorInput())).getRole();
+		userList = new ArrayList<UserDTO>();
+		
+		try
+		{
+			securityService = ServiceWrapper.getInstance().getSecurityService();
+		}
+		catch (ConnectionException e)
+		{
+			//This exception should have already been tested
+			LoggerPlugin.LogWarning(SecurityActivator.PLUGIN_ID, LoggingConstants.UNEXPECTED_EXCEPTION, 
+				"Couldn't get Security service", e);
+		}
+	}
+	
+	@Override
+	protected void createFormContent(IManagedForm managedForm)
+	{
+		toolkit = managedForm.getToolkit();
+		TableWrapLayout layout = new TableWrapLayout();
+		layout.numColumns = 2;
+		managedForm.getForm().getBody().setLayout(layout);
+		managedForm.getForm().setText(this.title);
+
+		createMainSection(managedForm);
+		//createInheritedRoleSection(managedForm);
+		createMemberUserSection(managedForm);
+
+		//Data binding
+		bindGUI();
+	}
+	
+	private void createMainSection(IManagedForm managedForm)
+	{
+		GridData data = new GridData...
 
[truncated message content]

[Escapek-commits] SF.net SVN: escapek: [813] org.escapek.server/trunk

From: <nic...@us...> - 2007-02-15 20:42:58

Revision: 813
          http://svn.sourceforge.net/escapek/?rev=813&view=rev
Author:   nicolasjouanin
Date:     2007-02-15 12:42:53 -0800 (Thu, 15 Feb 2007)

Log Message:
-----------
add getRoleHeritedTole() method.

Modified Paths:
--------------
    org.escapek.server/trunk/META-INF/MANIFEST.MF
    org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java
    org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java
    org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java

Modified: org.escapek.server/trunk/META-INF/MANIFEST.MF
===================================================================
--- org.escapek.server/trunk/META-INF/MANIFEST.MF	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/META-INF/MANIFEST.MF	2007-02-15 20:42:53 UTC (rev 813)
@@ -4,7 +4,6 @@
 Bundle-SymbolicName: org.escapek.server;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.escapek.server.ServerPlugin
-Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.navigator,
  org.eclipse.core.runtime
 Eclipse-LazyStart: true

Modified: org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java
===================================================================
--- org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/src/org/escapek/core/internal/model/security/Role.java	2007-02-15 20:42:53 UTC (rev 813)
@@ -57,7 +57,7 @@
 	private String description;
 	private Collection<User> grantedUsers;
 	private Collection<RolePrivilege> grantedPrivileges;
-	private Collection<Role> grantedRoles;
+	private Collection<Role> inheritedRoles;
 	
 	public Role()
 	{
@@ -108,13 +108,13 @@
 	 */
 	@ManyToMany(
         cascade={CascadeType.PERSIST, CascadeType.MERGE},
-        mappedBy="grantedRoles",
+        mappedBy="inheritedRoles",
         targetEntity=User.class
     )
     public Collection<User> getGrantedUsers() { return grantedUsers; }
 	/**
 	 * @param grantedUsers  the grantedUsers to set
-	 * @uml.property  name="grantedRoles"
+	 * @uml.property  name="inheritedRoles"
 	 */
 	public void setGrantedUsers(Collection<User> users) { this.grantedUsers = users; }
 	
@@ -159,11 +159,11 @@
         joinColumns={@JoinColumn(name="ROLE_FK")},
         inverseJoinColumns={@JoinColumn(name="GRANTED_ROLE_FK")}
     )
-	public Collection<Role> getGrantedRoles() {
-		return grantedRoles;
+	public Collection<Role> getInheritedRoles() {
+		return inheritedRoles;
 	}
 
-	public void setGrantedRoles(Collection<Role> grantedRoles) {
-		this.grantedRoles = grantedRoles;
+	public void setInheritedRoles(Collection<Role> grantedRoles) {
+		this.inheritedRoles = grantedRoles;
 	}
 }

Modified: org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java
===================================================================
--- org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/src/org/escapek/core/services/impl/SecurityServiceBean.java	2007-02-15 20:42:53 UTC (rev 813)
@@ -375,8 +375,8 @@
 				return true;
 		}
 				
-		//Checking is one of the granted role is granted the checkedPrivilege
-		for(Role role : aRole.getGrantedRoles())
+		//Checking is one of the inherited role is granted the checkedPrivilege
+		for(Role role : aRole.getInheritedRoles())
 		{
 			log.debug(
 					"\tChecking " + checkedPrivilege.toString() + " privilege for granted role "+aRole.getName());
@@ -691,7 +691,7 @@
 		{
 			throw new EntityNotFoundException(Role.class.getName(), role);
 		}
-		role.getGrantedRoles().add(grantedRole);
+		role.getInheritedRoles().add(grantedRole);
 	}
 
 	public RolePrivilegeDTO grantRolePrivilege(Long ticketId, Long roleId, Privilege privilege)
@@ -803,4 +803,11 @@
 		Collection<User> users = getRole(roleId).getGrantedUsers();
 		return userAssembler.convertModelCollection(users);
 	}
+	
+	public Collection<RoleDTO> getInheritedRoles(Long ticketId, Long roleId) throws SecurityException
+	{
+		checkTicket(ticketId);
+		Collection<Role> inheritedRoles = getRole(roleId).getInheritedRoles();
+		return roleAssembler.convertModelCollection(inheritedRoles);
+	}
 }

Modified: org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java
===================================================================
--- org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java	2007-02-13 21:48:52 UTC (rev 812)
+++ org.escapek.server/trunk/src/org/escapek/core/services/interfaces/IRemoteSecurityService.java	2007-02-15 20:42:53 UTC (rev 813)
@@ -138,4 +138,5 @@
 	 */
 	public Collection<RolePrivilegeDTO> getRoleGrantedPrivileges(Long ticketId, Long roleId) throws SecurityException;
 	public Collection<UserDTO> getRoleGrantedUsers(Long ticketId, Long roleId) throws SecurityException;
+	public Collection<RoleDTO> getInheritedRoles(Long ticketId, Long roleId) throws SecurityException;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [812] website/trunk/squelettes

From: <nic...@us...> - 2007-02-13 21:48:56

Revision: 812
          http://svn.sourceforge.net/escapek/?rev=812&view=rev
Author:   nicolasjouanin
Date:     2007-02-13 13:48:52 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Force ad to JIRA on development section

Added Paths:
-----------
    website/trunk/squelettes/article-6.html
    website/trunk/squelettes/rubrique-6.html

Added: website/trunk/squelettes/article-6.html
===================================================================
--- website/trunk/squelettes/article-6.html	                        (rev 0)
+++ website/trunk/squelettes/article-6.html	2007-02-13 21:48:52 UTC (rev 812)
@@ -0,0 +1,211 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+  <head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+<BOUCLE_head(ARTICLES){id_article}>
+    <title>
+        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
+    </title>
+<meta name="description" content="#DESCRIPTIF" />
+<meta name="keywords" content="#SURTITRE" />
+</BOUCLE_head>
+    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
+    <link rel="shortcut icon" type="image/x-icon"
+          href="#URL_SITE_SPIP/favicon.ico" />
+  </head>
+
+<h1 id="sitename">
+    <a href="#URL_SITE_SPIP">Escape-K</a>
+    <p>Open-source administration platform</p>
+</h1>
+    <ul id="portal-globalnav">
+        <li>
+            <a href="#URL_SITE_SPIP">Home</a></li>
+        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
+        <li #EXPOSE{class="selected",class="plain"}><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
+        </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
+    </ul>
+
+<div id="portal-searchbox">
+    <form name="searchform" action="#URL_SITE_SPIP/spip.php?page=recherche" method="get"
+          style="white-space:nowrap">
+        <label for="recherche" class="hiddenStructure">Search</label>
+        <div class="LSBox">
+        <input name='page' value='recherche' type='hidden' />
+        <input id="recherche" tabindex="30000"
+               name="recherche" type="text" size="15"
+               title="Search Site" accesskey="4"
+               class="visibility:visible" />
+
+        <input class="searchButton" type="submit"
+               value="Search" />
+
+        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
+        </div>
+    </form>
+</div>
+
+<p id="portal-personaltools">
+&nbsp;
+</p>
+
+<div id="portal-breadcrumbs">
+    <span id="breadcrumbs-you-are-here">You are here:</span>
+    <a href="#URL_SITE_SPIP">Home</a>
+    <BOUCLE_a(ARTICLES){id_article}>
+      <BOUCLE_tree(HIERARCHIE){id_article}>
+      <span class="breadcrumbSeparator">
+          &rarr;
+      </span>
+      <span dir="ltr">
+              <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
+      </span>
+      </BOUCLE_tree>
+    </BOUCLE_a>
+    <BOUCLE_rubcur(ARTICLES){id_article}>
+    <span class="breadcrumbSeparator">
+        &rarr;
+    </span>
+    <span dir="ltr">
+            [(#TITRE|supprimer_numero)]
+    </span>
+    </BOUCLE_rubcur>
+</div>
+
+
+<div class="visualClear"><!-- --></div>
+<table id="portal-columns">
+  <tbody>
+    <tr>
+      <td id="portal-column-one">
+        <div class="visualPadding">
+
+<BOUCLE_t(ARTICLES){id_article}>
+<dl class="portlet" id="portlet-navigation-tree">
+    <BOUCLE_titrenav(RUBRIQUES){id_rubrique}>
+    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
+    </BOUCLE_titrenav>
+    <dd class="portletItem lastItem">
+        <ul class="portletNavigationTree navTreeLevel0">
+          <BOUCLE_art(ARTICLES){id_rubrique}{1,100}{par num titre}>
+             <li class="navTreeItem">
+                  <div>
+                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_ARTICLE">[(#TITRE|supprimer_numero)]</a>
+                  </div>
+             </li>
+          </BOUCLE_art>
+        </ul>
+    </dd>
+</dl>
+</BOUCLE_t>
+
+<B_links>
+<dl class="portlet" id="portlet-news">
+
+    <!-- span class="portletTopLeft" /-->
+    <dt class="portletHeader">
+            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
+                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
+            </a>
+            Links
+    </dt>
+    <!-- span class="portletTopRight" /-->
+
+<BOUCLE_links(SITES){id_rubrique}>
+    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
+        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
+    </dd>
+</BOUCLE_links>
+</dl>
+</B_links>
+
+<B_mots>
+<dl class="portlet" id="portlet-news">
+
+    <!-- span class="portletTopLeft" /-->
+    <dt class="portletHeader">
+            See also
+    </dt>
+<BOUCLE_mots(MOTS){id_article}>
+  <BOUCLE_art_mot(ARTICLES){id_mot}{doublons}>
+    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
+        <a href="#URL_ARTICLE"><img src="#CHEMIN{img/newsitem_icon.gif}" alt="" height="16" width="16" />
+            #TITRE
+        <span class="portletItemDetails">[(#DATE|affdate{'d.m.Y'})]</span>
+        </a>
+    </dd>
+  </BOUCLE_art_mot>
+</BOUCLE_mots>
+</dl>
+</B_mots>
+
+<dl class="portlet" id="portlet-news">
+
+    <!-- span class="portletTopLeft" /-->
+    <dt class="portletHeader">
+            Sponsor
+    </dt>
+    <!-- span class="portletTopRight" /-->
+
+    <dd style="margin: 0 0 0 0;padding: 0;" class="portletItem odd">
+        <a style="margin: 0 0 0 0;padding: 0;" href="http://www.atlassian.com/c/NPOS/10160"><img src="#CHEMIN{img/jira_tile_150wx300h.gif}"/></a>
+    </dd>
+ </dl>
+
+                &nbsp;
+              </div>
+            </td>
+            <td id="portal-column-content">
+
+                <div id="content" class="">
+                  <div class="documentContent" id="region-content">
+                    <a name="documentContent"></a>
+
+        <BOUCLE_art_content(ARTICLES){id_article}>
+        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
+        <div>
+            <div class="documentByLine">
+              <span>by #LESAUTEURS</span>&mdash;
+              <span>last modified</span> [(#DATE_MODIF|affdate{'d.m.Y'})]
+            </div>
+        </div>
+        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
+        #DEBUT_SURLIGNE
+        [(#TEXTE|justifier)]
+        #FIN_SURLIGNE
+        </BOUCLE_art_content>
+
+<div class="visualClear"></div>
+
+</div>
+
+                  </div>
+                </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="visualClear"><!-- --></div>
+      <hr class="netscape4" />
+<div id="portal-footer">
+
+<p>
+    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> [(#DATE|annee)] &mdash; Open Source Administration platform</a>
+</p>
+</div>
+<div id="portal-colophon">
+<p class="discreet">
+  This website is powered by:
+</p>
+<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+&nbsp;
+<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
+
+    </div>
+    </div>
+</body>
+</html>

Added: website/trunk/squelettes/rubrique-6.html
===================================================================
--- website/trunk/squelettes/rubrique-6.html	                        (rev 0)
+++ website/trunk/squelettes/rubrique-6.html	2007-02-13 21:48:52 UTC (rev 812)
@@ -0,0 +1,185 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+  <head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+<BOUCLE_head(RUBRIQUES){id_rubrique}>
+    <title>
+        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
+    </title>
+<meta name="description" content="#DESCRIPTIF" />
+<meta name="keywords" content="#TEXTE" />
+</BOUCLE_head>
+    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
+    <link rel="shortcut icon" type="image/x-icon"
+          href="#URL_SITE_SPIP/favicon.ico" />
+  </head>
+
+<h1 id="sitename">
+    <a href="#URL_SITE_SPIP">Escape-K</a>
+    <p>Open-source administration platform</p>
+</h1>
+    <ul id="portal-globalnav">
+        <li>
+            <a href="#URL_SITE_SPIP">Home</a></li>
+        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
+        <li #EXPOSE{class="selected",class="plain"}><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
+        </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
+    </ul>
+
+<div id="portal-searchbox">
+    <form name="searchform" action="#URL_SITE_SPIP/spip.php?page=recherche" method="get"
+          style="white-space:nowrap">
+        <label for="recherche" class="hiddenStructure">Search</label>
+        <div class="LSBox">
+        <input name='page' value='recherche' type='hidden' />
+        <input id="recherche" tabindex="30000"
+               name="recherche" type="text" size="15"
+               title="Search Site" accesskey="4"
+               class="visibility:visible" />
+
+        <input class="searchButton" type="submit"
+               value="Search" />
+
+        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
+        </div>
+    </form>
+</div>
+
+<p id="portal-personaltools">
+&nbsp;
+</p>
+
+<div id="portal-breadcrumbs">
+    <span id="breadcrumbs-you-are-here">You are here:</span>
+    <a href="#URL_SITE_SPIP">Home</a>
+    <BOUCLE_tree(HIERARCHIE){id_rubrique}>
+    <span class="breadcrumbSeparator">
+        &rarr;
+    </span>
+    <span dir="ltr">
+            <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
+    </span>
+    </BOUCLE_tree>
+    <BOUCLE_rubcur(RUBRIQUES){id_rubrique}>
+    <span class="breadcrumbSeparator">
+        &rarr;
+    </span>
+    <span dir="ltr">
+            [(#TITRE|supprimer_numero)]
+    </span>
+    </BOUCLE_rubcur>
+</div>
+
+
+<div class="visualClear"><!-- --></div>
+<table id="portal-columns">
+  <tbody>
+    <tr>
+      <td id="portal-column-one">
+        <div class="visualPadding">
+
+<dl class="portlet" id="portlet-navigation-tree">
+    <BOUCLE_titrenav(RUBRIQUES){id_rubrique}>
+    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
+    </BOUCLE_titrenav>
+    <dd class="portletItem lastItem">
+        <ul class="portletNavigationTree navTreeLevel0">
+          <BOUCLE_art(ARTICLES){id_rubrique}{1,100}{par num titre}>
+             <li class="navTreeItem">
+                  <div>
+                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_ARTICLE">[(#TITRE|supprimer_numero)]</a>
+                  </div>
+             </li>
+          </BOUCLE_art>
+        </ul>
+    </dd>
+</dl>
+
+<B_links>
+<dl class="portlet" id="portlet-news">
+
+    <!-- span class="portletTopLeft" /-->
+    <dt class="portletHeader">
+            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
+                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
+            </a>
+            Links
+    </dt>
+    <!-- span class="portletTopRight" /-->
+
+<BOUCLE_links(SITES){id_rubrique}>
+    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
+        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
+    </dd>
+</BOUCLE_links>
+</dl>
+</B_links>
+
+<dl class="portlet" id="portlet-news">
+
+    <!-- span class="portletTopLeft" /-->
+    <dt class="portletHeader">
+            Sponsor
+    </dt>
+    <!-- span class="portletTopRight" /-->
+
+    <dd style="margin: 0 0 0 0;padding: 0;" class="portletItem odd">
+        <a style="margin: 0 0 0 0;padding: 0;" href="http://www.atlassian.com/c/NPOS/10160"><img src="#CHEMIN{img/jira_tile_150wx300h.gif}"/></a>
+    </dd>
+ </dl>
+
+                &nbsp;
+              </div>
+            </td>
+            <td id="portal-column-content">
+
+                <div id="content" class="">
+                  <div class="documentContent" id="region-content">
+                    <a name="documentContent"></a>
+
+          <BOUCLE_art_content(ARTICLES){id_rubrique}{0,1}{par num titre}>
+          <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
+          <div>
+              <div class="documentByLine">
+                <span>by #LESAUTEURS</span>&mdash;
+                <span>last modified</span> [(#DATE_MODIF|affdate{'d.m.Y'})]
+              </div>
+          </div>
+          [<p class="documentDescription" align="justify">(#CHAPO)</p>]
+          [(#TEXTE|justifier)]
+          </BOUCLE_art_content>
+        </BOUCLE_content>
+<div class="visualClear"></div>
+
+</div>
+
+                  </div>
+                </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="visualClear"><!-- --></div>
+      <hr class="netscape4" />
+<div id="portal-footer">
+
+<p>
+    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> [(#DATE|annee)] &mdash; Open Source Administration platform</a>
+</p>
+</div>
+<div id="portal-colophon">
+<p class="discreet">
+  This website is powered by:
+</p>
+<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+&nbsp;
+<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
+
+    </div>
+    </div>
+</body>
+</html>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [811] website/trunk/squelettes

From: <nic...@us...> - 2007-02-13 21:42:53

Revision: 811
          http://svn.sourceforge.net/escapek/?rev=811&view=rev
Author:   nicolasjouanin
Date:     2007-02-13 13:41:58 -0800 (Tue, 13 Feb 2007)

Log Message:
-----------
Style update
Force ad to JIRA on development section

Modified Paths:
--------------
    website/trunk/squelettes/article.html
    website/trunk/squelettes/auteur.html
    website/trunk/squelettes/breve.html
    website/trunk/squelettes/breves.html
    website/trunk/squelettes/recherche.html
    website/trunk/squelettes/rubrique.html
    website/trunk/squelettes/sommaire.html
    website/trunk/squelettes/styles.css

Added Paths:
-----------
    website/trunk/squelettes/img/jira_tile_150wx300h.gif

Modified: website/trunk/squelettes/article.html
===================================================================
--- website/trunk/squelettes/article.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/article.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -26,6 +26,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li #EXPOSE{class="selected",class="plain"}><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">
@@ -220,4 +222,4 @@
     </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: website/trunk/squelettes/auteur.html
===================================================================
--- website/trunk/squelettes/auteur.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/auteur.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -26,6 +26,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li #EXPOSE{class="selected",class="plain"}><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">

Modified: website/trunk/squelettes/breve.html
===================================================================
--- website/trunk/squelettes/breve.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/breve.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -25,6 +25,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">
@@ -87,15 +89,6 @@
                       <a class="visualIconPadding  state-published navTreeCurrentItem contenttype-folder" href="#URL_SITE_SPIP">Home</a>
                   </div>
              </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_art(ARTICLES){id_rubrique=4}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_ARTICLE" class="state-published visualIconPadding">#TITRE</a>
-               </div>
-               </li>
-               </BOUCLE_art>
-              </ul>
           <BOUCLE_rub2(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
              <li class="navTreeItem">
                   <div>

Modified: website/trunk/squelettes/breves.html
===================================================================
--- website/trunk/squelettes/breves.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/breves.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -23,6 +23,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">
@@ -71,15 +73,6 @@
                       <a class="visualIconPadding  state-published navTreeCurrentItem contenttype-folder" href="#URL_SITE_SPIP">Home</a>
                   </div>
              </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_art(ARTICLES){id_rubrique=4}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_ARTICLE" class="state-published visualIconPadding">#TITRE</a>
-               </div>
-               </li>
-               </BOUCLE_art>
-              </ul>
           <BOUCLE_rub2(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
              <li class="navTreeItem">
                   <div>

Added: website/trunk/squelettes/img/jira_tile_150wx300h.gif
===================================================================
(Binary files differ)


Property changes on: website/trunk/squelettes/img/jira_tile_150wx300h.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: website/trunk/squelettes/recherche.html
===================================================================
--- website/trunk/squelettes/recherche.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/recherche.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -22,6 +22,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">

Modified: website/trunk/squelettes/rubrique.html
===================================================================
--- website/trunk/squelettes/rubrique.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/rubrique.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -26,6 +26,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li #EXPOSE{class="selected",class="plain"}><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">

Modified: website/trunk/squelettes/sommaire.html
===================================================================
--- website/trunk/squelettes/sommaire.html	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/sommaire.html	2007-02-13 21:41:58 UTC (rev 811)
@@ -7,7 +7,10 @@
     <title>
         #NOM_SITE_SPIP
     </title>
-    <meta name="description" content="Escape-K open-source administration platform" />
+    <BOUCLE_rub_meta(RUBRIQUES){id_rubrique=4}{tout}>
+    <meta name="description" content="#DESCRIPTIF" />
+    <meta name="keywords" content="#TEXTE" />
+    </BOUCLE_rub_meta>
     <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
     <link rel="shortcut icon" type="image/x-icon"
           href="#URL_SITE_SPIP/favicon.ico" />
@@ -23,6 +26,8 @@
         <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
         <li class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
         </BOUCLE_rub>
+        <li class="plain"><a href="http://forum.escapek.org/">Forum</a></li>
+        <li class="plain"><a href="http://wiki.escapek.org/">Wiki</a></li>
     </ul>
 
 <div id="portal-searchbox">
@@ -124,7 +129,6 @@
 google_ad_height = 240;
 google_ad_format = "120x240_as";
 google_ad_type = "text_image";
-google_ad_channel = "";
 google_color_border = "FFFFFF";
 google_color_bg = "FFFFFF";
 google_color_link = "436976";
@@ -187,4 +191,4 @@
     </div>
     </div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: website/trunk/squelettes/styles.css
===================================================================
--- website/trunk/squelettes/styles.css	2007-02-10 13:36:29 UTC (rev 810)
+++ website/trunk/squelettes/styles.css	2007-02-13 21:41:58 UTC (rev 811)
@@ -489,4 +489,4 @@
 a:link,a:visited {color: #520;background: transparent;}
 
 }
-
+.spip_surligne { background: #FF6; }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [810] website/trunk/squelettes

From: <nic...@us...> - 2007-02-10 13:36:31

Revision: 810
          http://svn.sourceforge.net/escapek/?rev=810&view=rev
Author:   nicolasjouanin
Date:     2007-02-10 05:36:29 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
Fix RSS feed

Modified Paths:
--------------
    website/trunk/squelettes/breves.html
    website/trunk/squelettes/sommaire.html

Added Paths:
-----------
    website/trunk/squelettes/img/feed.gif

Modified: website/trunk/squelettes/breves.html
===================================================================
--- website/trunk/squelettes/breves.html	2007-02-10 10:48:12 UTC (rev 809)
+++ website/trunk/squelettes/breves.html	2007-02-10 13:36:29 UTC (rev 810)
@@ -96,7 +96,7 @@
     <!-- span class="portletTopLeft" /-->
     <dt class="portletHeader">
             <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
+                <img alt="RSS" src="#CHEMIN{img/feed.gif}" />
             </a>
             News
     </dt>
@@ -164,6 +164,7 @@
         [(#TEXTE|justifier)]
         [<p>See: <a href="#URL_SITE">(#NOM_SITE)</a></p>]
         <div class="visualClear"></div>
+        <br/>
         </BOUCLE_brv_content>
 
 

Added: website/trunk/squelettes/img/feed.gif
===================================================================
(Binary files differ)


Property changes on: website/trunk/squelettes/img/feed.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: website/trunk/squelettes/sommaire.html
===================================================================
--- website/trunk/squelettes/sommaire.html	2007-02-10 10:48:12 UTC (rev 809)
+++ website/trunk/squelettes/sommaire.html	2007-02-10 13:36:29 UTC (rev 810)
@@ -87,8 +87,8 @@
 
     <!-- span class="portletTopLeft" /-->
     <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
+            <a href="#URL_SITE_SPIP/spip.php?page=backend-breves" class="feedButton link-plain">
+                <img alt="RSS" src="#CHEMIN{img/feed.gif}" />
             </a>
             News
     </dt>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Escapek-commits] SF.net SVN: escapek: [809] website/trunk/squelettes

From: <nic...@us...> - 2007-02-10 10:48:13

Revision: 809
          http://svn.sourceforge.net/escapek/?rev=809&view=rev
Author:   nicolasjouanin
Date:     2007-02-10 02:48:12 -0800 (Sat, 10 Feb 2007)

Log Message:
-----------
Website update
 - fix
 - more user friendly
 - more simple

Added Paths:
-----------
    website/trunk/squelettes/auteur.html
    website/trunk/squelettes/rubrique.html

Removed Paths:
-------------
    website/trunk/squelettes/article-11.html
    website/trunk/squelettes/article-19.html
    website/trunk/squelettes/article-2.html
    website/trunk/squelettes/article-20.html
    website/trunk/squelettes/article-6.html
    website/trunk/squelettes/rubrique-11.html
    website/trunk/squelettes/rubrique-19.html
    website/trunk/squelettes/rubrique-2.html
    website/trunk/squelettes/rubrique-20.html
    website/trunk/squelettes/rubrique-22.html
    website/trunk/squelettes/rubrique-6.html
    website/trunk/squelettes/rubrique=11.html

Deleted: website/trunk/squelettes/article-11.html
===================================================================
--- website/trunk/squelettes/article-11.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/article-11.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,230 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-<BOUCLE_head(ARTICLES){id_article}>
-    <title>
-        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
-    </title>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#SURTITRE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_a(ARTICLES){id_article}>
-      <BOUCLE_tree(HIERARCHIE){id_article}>
-      <span class="breadcrumbSeparator">
-          &rarr;
-      </span>
-      <span dir="ltr">
-              <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-      </span>
-      </BOUCLE_tree>
-    </BOUCLE_a>
-    <BOUCLE_rubcur(ARTICLES){id_article}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=11}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=11}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique=11}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-<B_mots>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            See also
-    </dt>
-<BOUCLE_mots(MOTS){id_article}>
-  <BOUCLE_art_mot(ARTICLES){id_mot}{doublons}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_ARTICLE"><img src="#CHEMIN{img/newsitem_icon.gif}" alt="" height="16" width="16" />
-            #TITRE
-        <span class="portletItemDetails">[(#DATE|affdate{'d.m.Y'})]</span>
-        </a>
-    </dd>
-  </BOUCLE_art_mot>
-</BOUCLE_mots>
-</dl>
-</B_mots>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_art_content(ARTICLES){id_article}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-        <div>
-            <div class="documentByLine">
-              <span>by #LESAUTEURS</span>&mdash;
-              <span>last modified</span> [(#DATE|affdate{'d.m.Y'})]
-            </div>
-        </div>
-        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
-        #DEBUT_SURLIGNE
-        [(#TEXTE|justifier)]
-        #FIN_SURLIGNE
-        </BOUCLE_art_content>
-
-<div class="visualClear"></div>
-
-</div>
-
-                  </div>
-                </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="visualClear"><!-- --></div>
-      <hr class="netscape4" />
-<div id="portal-footer">
-
-<p>
-    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> 2006 &mdash; Open Source Administration platform</a>
-</p>
-</div>
-<div id="portal-colophon">
-<p class="discreet">
-  This website is powered by:
-</p>
-<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-&nbsp;
-<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
-
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file

Deleted: website/trunk/squelettes/article-19.html
===================================================================
--- website/trunk/squelettes/article-19.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/article-19.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,230 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-<BOUCLE_head(ARTICLES){id_article}>
-    <title>
-        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
-    </title>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#SURTITRE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_a(ARTICLES){id_article}>
-      <BOUCLE_tree(HIERARCHIE){id_article}>
-      <span class="breadcrumbSeparator">
-          &rarr;
-      </span>
-      <span dir="ltr">
-              <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-      </span>
-      </BOUCLE_tree>
-    </BOUCLE_a>
-    <BOUCLE_rubcur(ARTICLES){id_article}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=19}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=19}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique=19}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-<B_mots>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            See also
-    </dt>
-<BOUCLE_mots(MOTS){id_article}>
-  <BOUCLE_art_mot(ARTICLES){id_mot}{doublons}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_ARTICLE"><img src="#CHEMIN{img/newsitem_icon.gif}" alt="" height="16" width="16" />
-            #TITRE
-        <span class="portletItemDetails">[(#DATE|affdate{'d.m.Y'})]</span>
-        </a>
-    </dd>
-  </BOUCLE_art_mot>
-</BOUCLE_mots>
-</dl>
-</B_mots>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_art_content(ARTICLES){id_article}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-        <div>
-            <div class="documentByLine">
-              <span>by #LESAUTEURS</span>&mdash;
-              <span>last modified</span> [(#DATE|affdate{'d.m.Y'})]
-            </div>
-        </div>
-        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
-        #DEBUT_SURLIGNE
-        [(#TEXTE|justifier)]
-        #FIN_SURLIGNE
-        </BOUCLE_art_content>
-
-<div class="visualClear"></div>
-
-</div>
-
-                  </div>
-                </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="visualClear"><!-- --></div>
-      <hr class="netscape4" />
-<div id="portal-footer">
-
-<p>
-    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> 2006 &mdash; Open Source Administration platform</a>
-</p>
-</div>
-<div id="portal-colophon">
-<p class="discreet">
-  This website is powered by:
-</p>
-<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-&nbsp;
-<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
-
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file

Deleted: website/trunk/squelettes/article-2.html
===================================================================
--- website/trunk/squelettes/article-2.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/article-2.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,230 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-<BOUCLE_head(ARTICLES){id_article}>
-    <title>
-        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
-    </title>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#SURTITRE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_a(ARTICLES){id_article}>
-      <BOUCLE_tree(HIERARCHIE){id_article}>
-      <span class="breadcrumbSeparator">
-          &rarr;
-      </span>
-      <span dir="ltr">
-              <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-      </span>
-      </BOUCLE_tree>
-    </BOUCLE_a>
-    <BOUCLE_rubcur(ARTICLES){id_article}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=2}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=2}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique=2}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-<B_mots>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            See also
-    </dt>
-<BOUCLE_mots(MOTS){id_article}>
-  <BOUCLE_art_mot(ARTICLES){id_mot}{doublons}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_ARTICLE"><img src="#CHEMIN{img/newsitem_icon.gif}" alt="" height="16" width="16" />
-            #TITRE
-        <span class="portletItemDetails">[(#DATE|affdate{'d.m.Y'})]</span>
-        </a>
-    </dd>
-  </BOUCLE_art_mot>
-</BOUCLE_mots>
-</dl>
-</B_mots>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_art_content(ARTICLES){id_article}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-        <div>
-            <div class="documentByLine">
-              <span>by #LESAUTEURS</span>&mdash;
-              <span>last modified</span> [(#DATE|affdate{'d.m.Y'})]
-            </div>
-        </div>
-        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
-        #DEBUT_SURLIGNE
-        [(#TEXTE|justifier)]
-        #FIN_SURLIGNE
-        </BOUCLE_art_content>
-
-<div class="visualClear"></div>
-
-</div>
-
-                  </div>
-                </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="visualClear"><!-- --></div>
-      <hr class="netscape4" />
-<div id="portal-footer">
-
-<p>
-    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> 2006 &mdash; Open Source Administration platform</a>
-</p>
-</div>
-<div id="portal-colophon">
-<p class="discreet">
-  This website is powered by:
-</p>
-<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-&nbsp;
-<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
-
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file

Deleted: website/trunk/squelettes/article-20.html
===================================================================
--- website/trunk/squelettes/article-20.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/article-20.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-<BOUCLE_head(ARTICLES){id_article}>
-    <title>
-        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
-    </title>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#SURTITRE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_a(ARTICLES){id_article}>
-      <BOUCLE_tree(HIERARCHIE){id_article}>
-      <span class="breadcrumbSeparator">
-          &rarr;
-      </span>
-      <span dir="ltr">
-              <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-      </span>
-      </BOUCLE_tree>
-    </BOUCLE_a>
-    <BOUCLE_rubcur(ARTICLES){id_article}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=20}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=20}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique=20}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-
-<B_mots>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            See also
-    </dt>
-<BOUCLE_mots(MOTS){id_article}>
-  <BOUCLE_art_mot(ARTICLES){id_mot}{doublons}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_ARTICLE"><img src="#CHEMIN{img/newsitem_icon.gif}" alt="" height="16" width="16" />
-            #TITRE
-        <span class="portletItemDetails">[(#DATE|affdate{'d.m.Y'})]</span>
-        </a>
-    </dd>
-  </BOUCLE_art_mot>
-</BOUCLE_mots>
-</dl>
-</B_mots>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_art_content(ARTICLES){id_article}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-        <div>
-            <div class="documentByLine">
-              <span>by #LESAUTEURS</span>&mdash;
-              <span>last modified</span> [(#DATE|affdate{'d.m.Y'})]
-            </div>
-        </div>
-        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
-        #DEBUT_SURLIGNE
-        [(#TEXTE|justifier)]
-        #FIN_SURLIGNE
-        </BOUCLE_art_content>
-
-<div class="visualClear"></div>
-
-</div>
-
-                  </div>
-                </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="visualClear"><!-- --></div>
-      <hr class="netscape4" />
-<div id="portal-footer">
-
-<p>
-    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> 2006 &mdash; Open Source Administration platform</a>
-</p>
-</div>
-<div id="portal-colophon">
-<p class="discreet">
-  This website is powered by:
-</p>
-<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-&nbsp;
-<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
-
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file

Deleted: website/trunk/squelettes/article-6.html
===================================================================
--- website/trunk/squelettes/article-6.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/article-6.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,230 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-<BOUCLE_head(ARTICLES){id_article}>
-    <title>
-        #NOM_SITE_SPIP - [(#TITRE|supprimer_numero)]
-    </title>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#SURTITRE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_a(ARTICLES){id_article}>
-      <BOUCLE_tree(HIERARCHIE){id_article}>
-      <span class="breadcrumbSeparator">
-          &rarr;
-      </span>
-      <span dir="ltr">
-              <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-      </span>
-      </BOUCLE_tree>
-    </BOUCLE_a>
-    <BOUCLE_rubcur(ARTICLES){id_article}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=6}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=6}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique=6}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-<B_mots>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            See also
-    </dt>
-<BOUCLE_mots(MOTS){id_article}>
-  <BOUCLE_art_mot(ARTICLES){id_mot}{doublons}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_ARTICLE"><img src="#CHEMIN{img/newsitem_icon.gif}" alt="" height="16" width="16" />
-            #TITRE
-        <span class="portletItemDetails">[(#DATE|affdate{'d.m.Y'})]</span>
-        </a>
-    </dd>
-  </BOUCLE_art_mot>
-</BOUCLE_mots>
-</dl>
-</B_mots>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_art_content(ARTICLES){id_article}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-        <div>
-            <div class="documentByLine">
-              <span>by #LESAUTEURS</span>&mdash;
-              <span>last modified</span> [(#DATE|affdate{'d.m.Y'})]
-            </div>
-        </div>
-        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
-        #DEBUT_SURLIGNE
-        [(#TEXTE|justifier)]
-        #FIN_SURLIGNE
-        </BOUCLE_art_content>
-
-<div class="visualClear"></div>
-
-</div>
-
-                  </div>
-                </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="visualClear"><!-- --></div>
-      <hr class="netscape4" />
-<div id="portal-footer">
-
-<p>
-    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> 2006 &mdash; Open Source Administration platform</a>
-</p>
-</div>
-<div id="portal-colophon">
-<p class="discreet">
-  This website is powered by:
-</p>
-<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-&nbsp;
-<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
-
-    </div>
-    </div>
-</body>
-</html>
\ No newline at end of file

Added: website/trunk/squelettes/auteur.html
===================================================================
--- website/trunk/squelettes/auteur.html	                        (rev 0)
+++ website/trunk/squelettes/auteur.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -0,0 +1,186 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en">
+  <head>
+    <meta http-equiv="Content-Type"
+          content="text/html;charset=utf-8" />
+<BOUCLE_head(AUTEURS){id_auteur}>
+    <title>
+        #NOM_SITE_SPIP - #NOM
+    </title>
+<meta name="description" content="#NOM" />
+<meta name="keywords" content="#NOM_SITE" />
+</BOUCLE_head>
+    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
+    <link rel="shortcut icon" type="image/x-icon"
+          href="#URL_SITE_SPIP/favicon.ico" />
+  </head>
+
+<h1 id="sitename">
+    <a href="#URL_SITE_SPIP">Escape-K</a>
+    <p>Open-source administration platform</p>
+</h1>
+    <ul id="portal-globalnav">
+        <li>
+            <a href="#URL_SITE_SPIP">Home</a></li>
+        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
+        <li #EXPOSE{class="selected",class="plain"}><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
+        </BOUCLE_rub>
+    </ul>
+
+<div id="portal-searchbox">
+    <form name="searchform" action="#URL_SITE_SPIP/spip.php?page=recherche" method="get"
+          style="white-space:nowrap">
+        <label for="recherche" class="hiddenStructure">Search</label>
+        <div class="LSBox">
+        <input name='page' value='recherche' type='hidden' />
+        <input id="recherche" tabindex="30000"
+               name="recherche" type="text" size="15"
+               title="Search Site" accesskey="4"
+               class="visibility:visible" />
+
+        <input class="searchButton" type="submit"
+               value="Search" />
+
+        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
+        </div>
+    </form>
+</div>
+
+<p id="portal-personaltools">
+&nbsp;
+</p>
+
+<div id="portal-breadcrumbs">
+    <span id="breadcrumbs-you-are-here">You are here:</span>
+    <a href="#URL_SITE_SPIP">Home</a>
+    <span class="breadcrumbSeparator">
+        &rarr;
+    </span>
+    <span dir="ltr">
+            Authors
+    </span>
+    <BOUCLE_rubcur(AUTEURS){id_auteur}>
+    <span class="breadcrumbSeparator">
+        &rarr;
+    </span>
+    <span dir="ltr">
+            #NOM
+    </span>
+    </BOUCLE_rubcur>
+</div>
+
+
+<div class="visualClear"><!-- --></div>
+<table id="portal-columns">
+  <tbody>
+    <tr>
+      <td id="portal-column-one">
+        <div class="visualPadding">
+
+<dl class="portlet" id="portlet-navigation-tree">
+    <dt class="portletHeader">Navigation
+    </dt>
+    <dd class="portletItem lastItem">
+        <ul class="portletNavigationTree navTreeLevel0">
+             <li class="navTreeItem">
+                  <div>
+                      <a class="visualIconPadding  state-published navTreeCurrentItem contenttype-folder" href="#URL_SITE_SPIP">Home</a>
+                  </div>
+             </li>
+          <BOUCLE_rub2(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
+             <li class="navTreeItem">
+                  <div>
+                      <a class="visualIconPadding  state-published contenttype-folder" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
+                  </div>
+             </li>
+          </BOUCLE_rub2>
+        </ul>
+    </dd>
+</dl>
+
+<dl class="portlet" id="portlet-news">
+
+    <!-- span class="portletTopLeft" /-->
+    <dt class="portletHeader">
+            <a href="http://www.google.com/">Ads by Google</a>
+    </dt>
+    <!-- span class="portletTopRight" /-->
+
+    <dd class="portletItem odd">
+<script type="text/javascript"><!--
+google_ad_client = "pub-4452283365892679";
+google_ad_width = 120;
+google_ad_height = 240;
+google_ad_format = "120x240_as";
+google_ad_type = "text_image";
+google_ad_channel = "";
+google_color_border = "FFFFFF";
+google_color_bg = "FFFFFF";
+google_color_link = "436976";
+google_color_text = "000000";
+google_color_url = "436976";
+//--></script>
+<script type="text/javascript"
+  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>    </dd>
+ </dl>
+
+                &nbsp;
+              </div>
+            </td>
+            <td id="portal-column-content">
+
+                <div id="content" class="">
+                  <div class="documentContent" id="region-content">
+                    <a name="documentContent"></a>
+
+        <BOUCLE_aut_content(AUTEURS){id_auteur}>
+        <h1 class="documentFirstHeading">#NOM</h1>
+        [<p class="documentDescription" align="justify">(#CHAPO)</p>]
+        #DEBUT_SURLIGNE
+        [(#BIO|justifier)]
+        #FIN_SURLIGNE
+        <B_art_aut>
+        <br/>
+        List of articles written by this author:
+        <ul>
+        <BOUCLE_art_aut(ARTICLES){id_auteur}{par date_modif}{inverse}>
+        <li>[(#TITRE|supprimer_numero)]<span class="documentByLine"> - <a href="#URL_ARTICLE">Read more ...</a></span>
+        <div class="documentByLine">#CHAPO ([(#DATE_MODIF|affdate{'d.m.Y'})])</div>
+        </li>
+        </BOUCLE_art_aut>
+        </ul>
+        </B_art_aut>
+        </BOUCLE_aut_content>
+
+<div class="visualClear"></div>
+
+</div>
+
+                  </div>
+                </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <div class="visualClear"><!-- --></div>
+      <hr class="netscape4" />
+<div id="portal-footer">
+
+<p>
+    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> [(#DATE|annee)] &mdash; Open Source Administration platform</a>
+</p>
+</div>
+<div id="portal-colophon">
+<p class="discreet">
+  This website is powered by:
+</p>
+<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
+&nbsp;
+<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
+
+    </div>
+    </div>
+</body>
+</html>
\ No newline at end of file

Deleted: website/trunk/squelettes/rubrique-11.html
===================================================================
--- website/trunk/squelettes/rubrique-11.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/rubrique-11.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,217 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-    <title>
-        #NOM_SITE_SPIP
-    </title>
-<BOUCLE_head(RUBRIQUES){id_rubrique}>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#TEXTE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_tree(HIERARCHIE){id_rubrique}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-    </span>
-    </BOUCLE_tree>
-    <BOUCLE_rubcur(RUBRIQUES){id_rubrique}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=2}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=2}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_content(RUBRIQUES){id_rubrique}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-          <BOUCLE_parent(RUBRIQUES){id_enfant}>
-            <a href="#URL_RUBRIQUE" class="link-parent">Up one level</a>
-          </BOUCLE_parent>
-
-        <p class="documentDescription" align="justify">#DESCRIPTIF</p>
-        <BOUCLE_art(ARTICLES){id_rubrique}>
-        <div style="width: 45%; float: left; text-align: center">
-            <h3><a class="link-plain" href="#URL_ARTICLE">#TITRE</a></h3>
-            <BOUCLE_doc(DOCUMENTS){id_article}{0,1}>
-                [<p><a class="link-plain" href="#URL_DOCUMENT">(#FICHIER|image_reduire{250})</a></p>]
-            </BOUCLE_doc>
-        </div>
-        <div style="float: left; width: 45%; text-align: justify; margin-top: 5em;">
-        #TEXTE
-        </div>
-        <div class="visualClear"></div>
-        <hr />
-        </BOUCLE_art>
-        </BOUCLE_content>
-
-
-<div class="visualClear"></div>
-
-</div>
-
-                  </div>
-                </div>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <div class="visualClear"><!-- --></div>
-      <hr class="netscape4" />
-<div id="portal-footer">
-
-<p>
-    Copyright <a href="#URL_SITE_SPIP">Escape-K<sup>&copy;</sup> 2006 &mdash; Open Source Administration platform</a>
-</p>
-</div>
-<div id="portal-colophon">
-<p class="discreet">
-  This website is powered by:
-</p>
-<a href="http://sourceforge.net"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=162229&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo" /></a>
-&nbsp;
-<a href="http://www.spip.net" title="made with SPIP"><img src="dist/spip.png" alt="SPIP" width="48" height="16" class="format_png" /></a>
-
-    </div>
-    </div>
-</body>
-</html>

Deleted: website/trunk/squelettes/rubrique-19.html
===================================================================
--- website/trunk/squelettes/rubrique-19.html	2007-02-10 10:47:30 UTC (rev 808)
+++ website/trunk/squelettes/rubrique-19.html	2007-02-10 10:48:12 UTC (rev 809)
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
-      lang="en">
-  <head>
-    <meta http-equiv="Content-Type"
-          content="text/html;charset=utf-8" />
-    <title>
-        #NOM_SITE_SPIP
-    </title>
-<BOUCLE_head(RUBRIQUES){id_rubrique}>
-<meta name="description" content="#DESCRIPTIF" />
-<meta name="keywords" content="#TEXTE" />
-</BOUCLE_head>
-    <style type="text/css"><!-- @import url(#CHEMIN{styles.css}); --></style>
-    <link rel="shortcut icon" type="image/x-icon"
-          href="http://www.escapek.org/favicon.ico" />
-  </head>
-
-<h1 id="sitename">
-    <a href="#URL_SITE_SPIP">Escape-K</a>
-    <p>Open-source administration platform</p>
-</h1>
-    <ul id="portal-globalnav">
-        <li>
-            <a href="#URL_SITE_SPIP">Home</a></li>
-        <BOUCLE_rub(RUBRIQUES){id_rubrique!=4}{racine}{tout}{par num titre}>
-        <li #EXPOSE{class="selected"},class="plain"><a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a></li>
-        </BOUCLE_rub>
-    </ul>
-
-<div id="portal-searchbox">
-    <form name="searchform" action="http://www.escapek.org/spip.php?page=recherche" method="get"
-          style="white-space:nowrap">
-        <label for="recherche" class="hiddenStructure">Search</label>
-        <div class="LSBox">
-        <input name='page' value='recherche' type='hidden' />
-        <input id="recherche" tabindex="30000"
-               name="recherche" type="text" size="15"
-               title="Search Site" accesskey="4"
-               class="visibility:visible" />
-
-        <input class="searchButton" type="submit"
-               value="Search" />
-
-        <div class="LSResult" id="LSResult" style=""><div class="LSShadow" id="LSShadow"></div></div>
-        </div>
-    </form>
-</div>
-
-<p id="portal-personaltools">
-&nbsp;
-</p>
-
-<div id="portal-breadcrumbs">
-    <span id="breadcrumbs-you-are-here">You are here:</span>
-    <a href="#URL_SITE_SPIP">Home</a>
-    <BOUCLE_tree(HIERARCHIE){id_rubrique}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            <a href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-    </span>
-    </BOUCLE_tree>
-    <BOUCLE_rubcur(RUBRIQUES){id_rubrique}>
-    <span class="breadcrumbSeparator">
-        &rarr;
-    </span>
-    <span dir="ltr">
-            [(#TITRE|supprimer_numero)]
-    </span>
-    </BOUCLE_rubcur>
-</div>
-
-
-<div class="visualClear"><!-- --></div>
-<table id="portal-columns">
-  <tbody>
-    <tr>
-      <td id="portal-column-one">
-        <div class="visualPadding">
-
-<dl class="portlet" id="portlet-navigation-tree">
-    <BOUCLE_titrenav(RUBRIQUES){id_rubrique=19}>
-    <dt class="portletHeader">[(#TITRE|supprimer_numero)]</dt>
-    </BOUCLE_titrenav>
-    <dd class="portletItem lastItem">
-        <ul class="portletNavigationTree navTreeLevel0">
-          <BOUCLE_rub2(RUBRIQUES){id_parent=19}{tout}{par num titre}>
-             <li class="navTreeItem">
-                  <div>
-                      <a class="visualIconPadding state-published contenttype-folder #EXPOSE{navTreeCurrentItem, }" href="#URL_RUBRIQUE">[(#TITRE|supprimer_numero)]</a>
-                  </div>
-             </li>
-              <ul class="navTreeLocal">
-                <BOUCLE_ssrub2(RUBRIQUES){id_parent}>
-                <li class="navTreeItem visualNoMarker">
-                <div class="contenttype-folder">
-                    <a href="#URL_RUBRIQUE" class="state-published visualIconPadding ">[(#TITRE|supprimer_numero)]</a>
-               </div>
-               </li>
-               </BOUCLE_ssrub2>
-              </ul>
-          </BOUCLE_rub2>
-        </ul>
-    </dd>
-</dl>
-
-<B_links>
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="#CHEMIN{backend.html}" class="feedButton link-plain">
-                <img alt="RSS" src="#CHEMIN{img/rss.gif}" />
-            </a>
-            Links
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-<BOUCLE_links(SITES){id_rubrique}>
-    <dd class="portletItem [(#COMPTEUR_BOUCLE|alterner{'odd','even'})]">
-        <a href="#URL_SITE"><img src="#CHEMIN{img/helplink_icon.gif}" alt="" height="16" width="16" />#NOM_SITE</a>
-    </dd>
-</BOUCLE_links>
-</dl>
-</B_links>
-
-<dl class="portlet" id="portlet-news">
-
-    <!-- span class="portletTopLeft" /-->
-    <dt class="portletHeader">
-            <a href="http://www.google.com/">Ads by Google</a>
-    </dt>
-    <!-- span class="portletTopRight" /-->
-
-    <dd class="portletItem odd">
-<script type="text/javascript"><!--
-google_ad_client = "pub-4452283365892679";
-google_ad_width = 120;
-google_ad_height = 240;
-google_ad_format = "120x240_as";
-google_ad_type = "text_image";
-google_ad_channel = "";
-google_color_border = "FFFFFF";
-google_color_bg = "FFFFFF";
-google_color_link = "436976";
-google_color_text = "000000";
-google_color_url = "436976";
-//--></script>
-<script type="text/javascript"
-  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>    </dd>
- </dl>
-
-                &nbsp;
-              </div>
-            </td>
-            <td id="portal-column-content">
-
-                <div id="content" class="">
-                  <div class="documentContent" id="region-content">
-                    <a name="documentContent"></a>
-
-        <BOUCLE_art_content(ARTICLES){id_rubrique}{0,1}{par num titre}>
-        <h1 class="documentFirstHeading">[(#TITRE|supprimer_numero)]</h1>
-        <div>
-            <div class="documentByLine">
-              <s...
 
[truncated message content]

Flat | Threaded

1 2 3 .. 40 > >> (Page 1 of 40)

2006	Jan	Feb	Mar	Apr (19)	May (63)	Jun (69)	Jul (74)	Aug (74)	Sep (236)	Oct (316)	Nov (22)	Dec (73)
2007	Jan (20)	Feb (12)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (15)	Oct	Nov (2)	Dec