aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjad2014-02-26 05:50:23 (EST)
committerjad2014-02-26 05:50:23 (EST)
commit0c3cc464aa11d2d85150f190d66d69c9381cc5da (patch)
treed55eddbf3ba81b4b6c5403562581f66801d9b289
parentf9e69daee750f9d7367a33b64e11e4ef7a739d8c (diff)
downloadorg.eclipse.lyo.core-0c3cc464aa11d2d85150f190d66d69c9381cc5da.zip
org.eclipse.lyo.core-0c3cc464aa11d2d85150f190d66d69c9381cc5da.tar.gz
org.eclipse.lyo.core-0c3cc464aa11d2d85150f190d66d69c9381cc5da.tar.bz2
Bug 428854 - Provide EMF models for the OSLC specifications and supportrefs/changes/54/22554/1
their code generation Allow an adaptor EMF model to be composed of pre-defined EMF models (mainly domain specification models). Provide initial versions of the OSLC Core domain specification and the Change Management domain specificaiton as EMF models. Change-Id: If3cc41f70ba734abb5b880f3ab072ac8a98c37e3 Signed-off-by: jad <jad@kth.se>
-rw-r--r--org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCChangeManagementSpecification.xmi66
-rw-r--r--org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCCoreSpecificationsSet.xmi36
-rw-r--r--org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecore4
-rw-r--r--org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecorediag751
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl14
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorConstants.mtl3
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl5
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl5
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl8
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl3
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateDelegatedUIJavaScripts.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateFilteredResourceCollectionJsp.mtl9
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateGetResourceJsp.mtl8
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResource.mtl29
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCollectionJsp.mtl8
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCreatorJsp.mtl10
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceSelectorJsp.mtl10
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateService.mtl33
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogHTML.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl3
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderHTML.mtl6
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderInfo.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl6
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/main/generate.mtl10
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/Services.java45
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/adaptorInterfaceServices.mtl18
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/domainSpecificationServices.mtl30
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/jspServices.mtl50
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourcePropertyServices.mtl15
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourceServices.mtl23
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderCatalogServices.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderServices.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceServices.mtl8
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/services.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEDLV10HTML.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEPLV10HTML.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateLicenseFiles.mtl2
-rw-r--r--org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateNoticeHTML.mtl2
39 files changed, 1083 insertions, 155 deletions
diff --git a/org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCChangeManagementSpecification.xmi b/org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCChangeManagementSpecification.xmi
new file mode 100644
index 0000000..39c3622
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCChangeManagementSpecification.xmi
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ASCII"?>
+<oslc4j_ai:Specification xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oslc4j_ai="http://org.eclipse.lyo/oslc4j/adaptorInterface" xsi:schemaLocation="http://org.eclipse.lyo/oslc4j/adaptorInterface adaptorInterface.ecore">
+ <domainSpecifications name="Change_Management" namespaceURI="http://open-services.net/ns/cm" namespacePrefix="//@domainPrefixes.0">
+ <resources name="ChangeRequest">
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.0"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.1"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.2"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.3"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.4"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.0"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.1"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.2"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.5"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.6"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.7"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.8"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.9"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.10"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.3"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.11"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.12"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.13"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.3/@resourceProperties.0"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.14"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.15"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.16"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.4"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.5"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.0/@resourceProperties.0"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.17"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.6"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.18"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.0/@resourceProperties.1"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.7"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.19"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.0/@resourceProperties.2"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.0/@resourceProperties.3"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.20"/>
+ <resourceProperties href="OSLCCoreSpecificationsSet.xmi#//@domainSpecifications.2/@resourceProperties.8"/>
+ <resourceProperties href="#//@domainSpecifications.0/@resourceProperties.21"/>
+ </resources>
+ <resourceProperties title="" name="affectedByDefect" occurs="zeroOrMany" valueType="Resource" description="Change request is affected by a reported defect. It is likely that the target resource will be an oslc_cm:ChangeRequest but that is not necessarily the case."/>
+ <resourceProperties title="" name="affectsPlanItem" occurs="zeroOrMany" valueType="Resource" description="Change request affects a plan item. It is likely that the target resource will be an oslc_cm:ChangeRequest but that is not necessarily the case."/>
+ <resourceProperties title="" name="affectsRequirement" occurs="zeroOrMany" valueType="Resource" description="Change request affecting a Requirement. It is likely that the target resource will be an oslc_rm:Requirement but that is not necessarily the case."/>
+ <resourceProperties title="" name="affectsTestResult" occurs="zeroOrMany" valueType="Resource" description="Associated QM resource that is affected by this Change Request. It is likely that the target resource will be an oslc_qm:TestResult but that is not necessarily the case."/>
+ <resourceProperties title="" name="blocksTestExecutionRecord" occurs="zeroOrMany" valueType="Resource" description="Associated QM resource that is blocked by this Change Request. It is likely that the target resource will be an oslc_qm:TestExecutionRecord but that is not necessarily the case."/>
+ <resourceProperties title="" name="implementsRequirement" occurs="zeroOrMany" valueType="Resource" description="Implements associated Requirement. It is likely that the target resource will be an oslc_rm:Requirement but that is not necessarily the case."/>
+ <resourceProperties title="" name="relatedChangeRequest" occurs="zeroOrMany" valueType="Resource" description="This relationship is loosely coupled and has no specific meaning. It is likely that the target resource will be an oslc_cm:ChangeRequest but that is not necessarily the case."/>
+ <resourceProperties title="" name="relatedTestCase" occurs="zeroOrMany" valueType="Resource" description="Related QM test case resource. It is likely that the target resource will be an oslc_qm:TestCase but that is not necessarily the case."/>
+ <resourceProperties title="" name="relatedTestExecutionRecord" occurs="zeroOrMany" valueType="Resource" description="Related to a QM test execution resource. It is likely that the target resource will be an oslc_qm:TestExecutionRecord but that is not necessarily the case."/>
+ <resourceProperties title="" name="relatedTestPlan" occurs="zeroOrMany" valueType="Resource" description="Related QM test plan resource. It is likely that the target resource will be an oslc_qm:TestPlan but that is not necessarily the case."/>
+ <resourceProperties title="" name="relatedTestScript" occurs="zeroOrMany" valueType="Resource" description="Related QM test script resource. It is likely that the target resource will be an oslc_qm:TestScript but that is not necessarily the case."/>
+ <resourceProperties title="" name="testedByTestCase" occurs="zeroOrMany" valueType="Resource" description="Test case by which this change request is tested. It is likely that the target resource will be an oslc_qm:TestCase but that is not necessarily the case."/>
+ <resourceProperties title="" name="tracksChangeSet" occurs="zeroOrMany" valueType="Resource" description="Tracks SCM change set resource. It is likely that the target resource will be an oslc_scm:ChangeSet but that is not necessarily the case."/>
+ <resourceProperties title="" name="tracksRequirement" occurs="zeroOrMany" valueType="Resource" description="Tracks the associated Requirement or Requirement ChangeSet resources. It is likely that the target resource will be an oslc_rm:Requirement but that is not necessarily the case."/>
+ <resourceProperties title="" name="approved" occurs="zeroOrOne" readOnly="true" description="Whether or not the Change Request has been approved."/>
+ <resourceProperties title="" name="closed" occurs="zeroOrOne" readOnly="true" description="Whether or not the Change Request is completely done, no further fixes or fix verification is needed."/>
+ <resourceProperties title="" name="closeDate" occurs="zeroOrOne" readOnly="true" valueType="DateTime" description="The date at which no further activity or work is intended to be conducted."/>
+ <resourceProperties title="" name="fixed" occurs="zeroOrOne" readOnly="true" description="Whether or not the Change Request has been fixed."/>
+ <resourceProperties title="" name="inprogress" occurs="zeroOrOne" readOnly="true" description="Whether or not the Change Request in a state indicating that active work is occurring. If oslc_cm:inprogress is true, then oslc_cm:fixed and oslc_cm:closed must also be false"/>
+ <resourceProperties title="" name="reviewed" occurs="zeroOrOne" readOnly="true" description="Whether or not the Change Request has been reviewed."/>
+ <resourceProperties title="" name="status" occurs="zeroOrOne" valueType="String" description="Used to indicate the status of the change request based on values defined by the service provider. Most often a read-only property. Some possible values may include: 'Submitted', 'Done', 'InProgress', etc."/>
+ <resourceProperties title="" name="verified" occurs="zeroOrOne" readOnly="true" description="Whether or not the resolution or fix of the Change Request has been verified."/>
+ </domainSpecifications>
+ <domainPrefixes name="oslc_cm"/>
+</oslc4j_ai:Specification>
diff --git a/org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCCoreSpecificationsSet.xmi b/org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCCoreSpecificationsSet.xmi
new file mode 100644
index 0000000..3837d24
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.adaptormodel/model/OSLCCoreSpecificationsSet.xmi
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?>
+<oslc4j_ai:Specification xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:oslc4j_ai="http://org.eclipse.lyo/oslc4j/adaptorInterface" xsi:schemaLocation="http://org.eclipse.lyo/oslc4j/adaptorInterface adaptorInterface.ecore">
+ <domainSpecifications name="OSLC_CORE" namespaceURI="http://open-services.net/ns/core" namespacePrefix="//@domainPrefixes.0">
+ <resourceProperties title="" name="discussedBy" occurs="zeroOrOne" valueType="Resource" representation="either" description="A series of notes and comments about this resource."/>
+ <resourceProperties title="" name="instanceShape" occurs="zeroOrOne" valueType="Resource" description="The URI of a Resource Shape that describes the possible properties, occurrence, value types, allowed values and labels. This shape information is useful in displaying the subject resource as well as guiding clients in performing modifications. Instance shapes may be specific to the authenticated user associated with the request that retrieved the resource, the current state of the resource and other factors and thus should not be cached."/>
+ <resourceProperties title="" name="serviceProvider" valueType="URI" description="A link to the resource's OSLC Service Provider. There may be cases when the subject resource is available from a service provider that implements multiple domain specifications, which could result in multiple values for this property. "/>
+ <resourceProperties title="" name="shortTitle" occurs="zeroOrOne" valueType="XMLLiteral" description="Shorter form of dcterms:title for the resource represented as rich text in XHTML content. SHOULD include only content that is valid inside an XHTML &lt;span> element."/>
+ </domainSpecifications>
+ <domainSpecifications name="FOAF" namespaceURI="http://xmlns.com/foaf/0.1" namespacePrefix="//@domainPrefixes.1">
+ <resources name="Person" resourceProperties="//@domainSpecifications.1/@resourceProperties.0 //@domainSpecifications.1/@resourceProperties.1 //@domainSpecifications.1/@resourceProperties.2"/>
+ <resourceProperties title="" name="name" valueType="String" description="The full name of a person expressed as simple text string."/>
+ <resourceProperties name="givenName" valueType="String" description="Given name of person expressed as simple text string."/>
+ <resourceProperties name="familyName" valueType="String" description="Family name of person expressed as simple text string."/>
+ </domainSpecifications>
+ <domainSpecifications name="Dublin Core" namespaceURI="http://purl.org/dc/terms" namespacePrefix="//@domainPrefixes.2">
+ <resources name="Type"/>
+ <resourceProperties title="" name="contributor" occurs="zeroOrMany" valueType="LocalResource" representation="either" range="//@domainSpecifications.1/@resources.0" description="Contributor or contributors to the resource. It is likely that the target resource will be a foaf:Person but that is not necessarily the case. "/>
+ <resourceProperties title="" name="creator" occurs="zeroOrMany" valueType="LocalResource" representation="either" range="//@domainSpecifications.1/@resources.0" description="Creator or creators of resource (reference: Dublin Core). It is likely that the target resource will be a foaf:Person but that is not necessarily the case."/>
+ <resourceProperties title="" name="type" occurs="zeroOrMany" valueType="LocalResource" range="//@domainSpecifications.2/@resources.0" description="A short string representation for the type, example 'Defect'."/>
+ <resourceProperties title="" name="subject" occurs="zeroOrMany" valueType="String" description="Tag or keyword for a resource. Each occurrence of a dcterms:subject property denotes an additional tag for the resource."/>
+ <resourceProperties title="" name="created" occurs="zeroOrOne" readOnly="true" valueType="DateTime" description="Timestamp of resource creation"/>
+ <resourceProperties title="" name="description" occurs="zeroOrOne" valueType="XMLLiteral" description="Descriptive text about resource represented as rich text in XHTML content. SHOULD include only content that is valid and suitable inside an XHTML &lt;div> element. "/>
+ <resourceProperties title="" name="identifier" readOnly="true" valueType="String" description="A unique identifier for a resource. Typically read-only and assigned by the service provider when a resource is created. Not typically intended for end-user display."/>
+ <resourceProperties title="" name="modified" occurs="zeroOrOne" readOnly="true" valueType="DateTime" description="Timestamp last latest resource modification"/>
+ <resourceProperties title="" name="title" valueType="XMLLiteral" description="Title of the resource represented as rich text in XHTML content. SHOULD include only content that is valid inside an XHTML &lt;span> element. "/>
+ </domainSpecifications>
+ <domainSpecifications name="RDF" namespaceURI="http://www.w3.org/1999/02/22-rdf-syntax-ns" namespacePrefix="//@domainPrefixes.3">
+ <resourceProperties title="" name="type" occurs="zeroOrMany" valueType="URI" description="The resource type URIs."/>
+ </domainSpecifications>
+ <domainSpecifications name="RDFS" namespaceURI="http://www.w3.org/2000/01/rdf-schema" namespacePrefix="//@domainPrefixes.4"/>
+ <domainPrefixes name="oslc"/>
+ <domainPrefixes name="foaf"/>
+ <domainPrefixes name="dcterms"/>
+ <domainPrefixes name="rdf"/>
+ <domainPrefixes name="rdfs"/>
+</oslc4j_ai:Specification>
diff --git a/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecore b/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecore
index 475abb7..dc09d11 100644
--- a/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecore
+++ b/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecore
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="adaptorInterface" nsURI="org.eclipse.lyo.oslc4j.adaptorInterface"
- nsPrefix="ai">
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="adaptorinterface" nsURI="http://org.eclipse.lyo/oslc4j/adaptorInterface"
+ nsPrefix="oslc4j_ai">
<eClassifiers xsi:type="ecore:EClass" name="AdaptorInterface">
<eStructuralFeatures xsi:type="ecore:EReference" name="serviceProviderCatalog"
lowerBound="1" eType="#//ServiceProviderCatalog" containment="true"/>
diff --git a/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecorediag b/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecorediag
new file mode 100644
index 0000000..4d78edd
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.adaptormodel/model/adaptorInterface.ecorediag
@@ -0,0 +1,751 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_OxU90J1MEeOAifIf_y6J9w" type="EcoreTools" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_O8XJIJ1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_O-Tp4J1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_O-eB8J1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_O_8BkJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//AdaptorInterface/name"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_O_8BkZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O_8ooJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//AdaptorInterface/javaClassBaseNamespace"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_O_8ooZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O_8oop1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//AdaptorInterface/javaFilesBasePath"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_O_8oo51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O_9PsJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//AdaptorInterface/jspFilesBasePath"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_O_9PsZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O_9Psp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//AdaptorInterface/javascriptFilesBasePath"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_O_9Ps51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_O-eB8Z1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_O-eB8p1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_O-eB851MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O-fQEJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_O-fQEZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_O-fQEp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_O-fQE51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_O8XwMJ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//AdaptorInterface"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O8XwMZ1MEeOAifIf_y6J9w" x="378" y="-369"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O_92wJ1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_O_-d0J1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_O__E4J1MEeOAifIf_y6J9w" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_O__E4Z1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_O__E4p1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_O__E451MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O__E5J1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_O__E5Z1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_O__E5p1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_O__E551MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_O_92wZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//Specification"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O_92wp1MEeOAifIf_y6J9w" x="558" y="-225"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_O__E6J1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_O__r8J1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAATAJ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAA6FJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//DomainSpecification/name"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAA6FZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PACIMJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//DomainSpecification/namespaceURI"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PACIMZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAATAZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAATAp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAATA51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAA6EJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAA6EZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAA6Ep1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAA6E51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_O__E6Z1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//DomainSpecification"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O__E6p1MEeOAifIf_y6J9w" x="558" y="-90"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PACIMp1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PACvQJ1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PACvQZ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PADWVJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//NamespacePrefix/name"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PADWVZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PACvQp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PACvQ51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PACvRJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PADWUJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PADWUZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PADWUp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PADWU51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PACIM51MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//NamespacePrefix"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PACINJ1MEeOAifIf_y6J9w" x="747" y="-162"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAD9YJ1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAD9Y51MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAEkcJ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAEkeJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ServiceProviderCatalog/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAEkeZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAFLgJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ServiceProviderCatalog/description"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAFLgZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAEkcZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAEkcp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAEkc51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAEkdJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAEkdZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAEkdp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAEkd51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAD9YZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//ServiceProviderCatalog"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAD9Yp1MEeOAifIf_y6J9w" x="288" y="-225" width="138"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAFLgp1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAFykJ1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAFykZ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAGZpJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ServiceProvider/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAGZpZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAHAsJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ServiceProvider/description"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAHAsZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAFykp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAFyk51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAFylJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAGZoJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAGZoZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAGZop1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAGZo51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAFLg51MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//ServiceProvider"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAFLhJ1MEeOAifIf_y6J9w" x="288" y="-126"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAHAsp1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAHnwJ1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAHnwZ1MEeOAifIf_y6J9w" type="5001">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAHnwp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAHnw51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAHnxJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAHnxZ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAHnxp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAHnx51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAHnyJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAHAs51MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//Service"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAHAtJ1MEeOAifIf_y6J9w" x="306" y="-9"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAIO0J1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAIO051MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAI14J1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAJc8J1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Resource/name"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAJc8Z1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAI14Z1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAI14p1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAI1451MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAI15J1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAI15Z1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAI15p1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAI1551MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAIO0Z1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//Resource"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAIO0p1MEeOAifIf_y6J9w" x="603" y="279"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAJc8p1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAKEAZ1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAKEAp1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAKrFp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAKrF51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PALSIJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/name"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PALSIZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAL5MJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/occurs"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAL5MZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAMgQJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/readOnly"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAMgQZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAMgQp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/valueType"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAMgQ51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PANHUJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/representation"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PANHUZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PANHUp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//ResourceProperty/description"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PANHU51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAKEA51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAKrEJ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAKrEZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAKrEp1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAKrE51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAKrFJ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAKrFZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAJc851MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//ResourceProperty"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAKEAJ1MEeOAifIf_y6J9w" x="765" y="90"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAPjkJ1MEeOAifIf_y6J9w" type="1005">
+ <children xmi:type="notation:Node" xmi:id="_PAQxsJ1MEeOAifIf_y6J9w" type="4010"/>
+ <children xmi:type="notation:Node" xmi:id="_PARYwJ1MEeOAifIf_y6J9w" type="5008">
+ <children xmi:type="notation:Node" xmi:id="_PAR_0J1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyOccurs/exactlyOne"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAR_0Z1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAR_0p1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyOccurs/zeroOrOne"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAR_051MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PASm4J1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyOccurs/zeroOrMany"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PASm4Z1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PASm4p1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyOccurs/oneOrMany"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PASm451MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PARYwZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PARYwp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PARYw51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAPjkZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EEnum" href="adaptorInterface.ecore#//ResourcePropertyOccurs"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAPjkp1MEeOAifIf_y6J9w" x="882" y="-288"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PATN8J1MEeOAifIf_y6J9w" type="1005">
+ <children xmi:type="notation:Node" xmi:id="_PAT1AJ1MEeOAifIf_y6J9w" type="4010"/>
+ <children xmi:type="notation:Node" xmi:id="_PAT1AZ1MEeOAifIf_y6J9w" type="5008">
+ <children xmi:type="notation:Node" xmi:id="_PAT1BZ1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/Boolean"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAT1Bp1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAUcEJ1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/String"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAUcEZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAUcEp1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/DateTime"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAUcE51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAVDIJ1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/XMLLiteral"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAVDIZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAVDIp1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/Resource"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAVDI51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAVqMJ1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/LocalResource"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAVqMZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAVqMp1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyValueType/URI"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAVqM51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAT1Ap1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAT1A51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAT1BJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PATN8Z1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EEnum" href="adaptorInterface.ecore#//ResourcePropertyValueType"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PATN8p1MEeOAifIf_y6J9w" x="882" y="-72"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAWRQJ1MEeOAifIf_y6J9w" type="1005">
+ <children xmi:type="notation:Node" xmi:id="_PAWRQ51MEeOAifIf_y6J9w" type="4010"/>
+ <children xmi:type="notation:Node" xmi:id="_PAW4UJ1MEeOAifIf_y6J9w" type="5008">
+ <children xmi:type="notation:Node" xmi:id="_PAW4VJ1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyRepresentation/reference"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAW4VZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAW4Vp1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyRepresentation/inline"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAW4V51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAXfYJ1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyRepresentation/either"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAXfYZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAXfYp1MEeOAifIf_y6J9w" type="2006">
+ <element xmi:type="ecore:EEnumLiteral" href="adaptorInterface.ecore#//ResourcePropertyRepresentation/n%2Fa"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAXfY51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAW4UZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAW4Up1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAW4U51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAWRQZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EEnum" href="adaptorInterface.ecore#//ResourcePropertyRepresentation"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAWRQp1MEeOAifIf_y6J9w" x="882" y="-180"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAYGcJ1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAYGc51MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAYGdJ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAYthJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//CreationFactory/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAYthZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAZUkJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//CreationFactory/label"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAZUkZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAZUkp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//CreationFactory/creationURI"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAZUk51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAYGdZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAYGdp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAYGd51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAYtgJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAYtgZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAYtgp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAYtg51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAYGcZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//CreationFactory"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAYGcp1MEeOAifIf_y6J9w" x="90" y="81"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAZUlJ1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAaisJ1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAaisZ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAbJxJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//QueryCapability/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAbJxZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAbw0J1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//QueryCapability/label"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAbw0Z1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAcX4J1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//QueryCapability/queryBaseURI"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAcX4Z1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAaisp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAais51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAaitJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAbJwJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAbJwZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAbJwp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAbJw51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAZUlZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//QueryCapability"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAZUlp1MEeOAifIf_y6J9w" x="252" y="81"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAc-8J1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAc-851MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAc-9J1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAdmB51MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Dialog/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAdmCJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAeNEJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Dialog/label"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAeNEZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAeNEp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Dialog/dialogURI"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAeNE51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAe0IJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Dialog/hintWidth"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAe0IZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAe0Ip1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Dialog/hintHeight"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAe0I51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAdmAJ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAdmAZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAdmAp1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAdmA51MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAdmBJ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAdmBZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAdmBp1MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAc-8Z1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//Dialog"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAc-8p1MEeOAifIf_y6J9w" x="423" y="81"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAe0JJ1MEeOAifIf_y6J9w" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_PAfbMJ1MEeOAifIf_y6J9w" type="4001"/>
+ <children xmi:type="notation:Node" xmi:id="_PAfbMZ1MEeOAifIf_y6J9w" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_PAgCRJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Publisher/title"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAgCRZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAgCRp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Publisher/label"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAgCR51MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAgpUJ1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Publisher/identifier"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAgpUZ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAgpUp1MEeOAifIf_y6J9w" type="2001">
+ <element xmi:type="ecore:EAttribute" href="adaptorInterface.ecore#//Publisher/icon"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PAgpU51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAfbMp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAfbM51MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAfbNJ1MEeOAifIf_y6J9w"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PAgCQJ1MEeOAifIf_y6J9w" type="5002">
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_PAgCQZ1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_PAgCQp1MEeOAifIf_y6J9w"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_PAgCQ51MEeOAifIf_y6J9w"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_PAe0JZ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10" fillColor="13761016" lineColor="8421504"/>
+ <element xmi:type="ecore:EClass" href="adaptorInterface.ecore#//Publisher"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PAe0Jp1MEeOAifIf_y6J9w" x="108" y="-189"/>
+ </children>
+ <styles xmi:type="notation:DiagramStyle" xmi:id="_OxU90Z1MEeOAifIf_y6J9w"/>
+ <element xmi:type="ecore:EPackage" href="adaptorInterface.ecore#/"/>
+ <edges xmi:type="notation:Edge" xmi:id="_PA98UJ1MEeOAifIf_y6J9w" type="3002" source="_O8XJIJ1MEeOAifIf_y6J9w" target="_PAD9YJ1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PA_xgJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PA_xgZ1MEeOAifIf_y6J9w" x="21" y="-19"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBKJkJ1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBKJkZ1MEeOAifIf_y6J9w" x="9" y="15"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PA98UZ1MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PA98Up1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//AdaptorInterface/serviceProviderCatalog"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PA98U51MEeOAifIf_y6J9w" points="[-145, 58, 23, -115]$[-172, 58, -4, -115]$[-172, 171, -4, -2]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJOCQJ1MEeOAifIf_y6J9w" id="(0.7461928934010152,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJOCQZ1MEeOAifIf_y6J9w" id="(0.5227272727272727,0.046153846153846156)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBReUJ1MEeOAifIf_y6J9w" type="3002" source="_O8XJIJ1MEeOAifIf_y6J9w" target="_O_92wJ1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBSFYJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBSFYZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBSFYp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBSFY51MEeOAifIf_y6J9w" x="9" y="-12"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBReUZ1MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBReUp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//AdaptorInterface/specification"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBReU51MEeOAifIf_y6J9w" points="[98, 63, -35, -157]$[137, 63, 4, -157]$[137, 180, 4, -40]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJPQYJ1MEeOAifIf_y6J9w" id="(0.49746192893401014,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJPQYZ1MEeOAifIf_y6J9w" id="(0.5,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBSFZJ1MEeOAifIf_y6J9w" type="3002" source="_O_92wJ1MEeOAifIf_y6J9w" target="_O__E6J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBSscJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBSscZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBSscp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBSsc51MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBSFZZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBSFZp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Specification/domainSpecifications"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBSFZ51MEeOAifIf_y6J9w" points="[0, 0, -58, 108]$[58, -108, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJM0IJ1MEeOAifIf_y6J9w" id="(0.49019607843137253,0.9761904761904762)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJM0IZ1MEeOAifIf_y6J9w" id="(0.3310344827586207,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBSsdJ1MEeOAifIf_y6J9w" type="3002" source="_O_92wJ1MEeOAifIf_y6J9w" target="_PACIMp1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBSseJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBSseZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBTTgJ1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBTTgZ1MEeOAifIf_y6J9w" x="17" y="16"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBSsdZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBSsdp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Specification/domainPrefixes"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBSsd51MEeOAifIf_y6J9w" points="[67, 9, -141, -101]$[208, 9, 0, -101]$[208, 63, 0, -47]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJP3cJ1MEeOAifIf_y6J9w" id="(0.3333333333333333,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJP3cZ1MEeOAifIf_y6J9w" id="(0.5142857142857142,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBTTgp1MEeOAifIf_y6J9w" type="3002" source="_O__E6J1MEeOAifIf_y6J9w" target="_PACIMp1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBTThp1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBTTh51MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBTTiJ1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBTTiZ1MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBTTg51MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBTThJ1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//DomainSpecification/namespacePrefix"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBTThZ1MEeOAifIf_y6J9w" points="[0, 0, 144, 60]$[-144, -60, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJK-8J1MEeOAifIf_y6J9w" id="(0.9103448275862069,0.5538461538461539)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJK-8Z1MEeOAifIf_y6J9w" id="(0.7523809523809524,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBT6kJ1MEeOAifIf_y6J9w" type="3002" source="_O__E6J1MEeOAifIf_y6J9w" target="_PAIO0J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBT6lJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBT6lZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBT6lp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBT6l51MEeOAifIf_y6J9w" x="34" y="-12"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBT6kZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBT6kp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//DomainSpecification/resources"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBT6k51MEeOAifIf_y6J9w" points="[0, 0, -122, 60]$[122, -60, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJLmAJ1MEeOAifIf_y6J9w" id="(0.5172413793103449,0.9538461538461539)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJLmAZ1MEeOAifIf_y6J9w" id="(0.24509803921568626,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBUhoJ1MEeOAifIf_y6J9w" type="3002" source="_O__E6J1MEeOAifIf_y6J9w" target="_PAJc8p1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBUhpJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBUhpZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBUhpp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBUhp51MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBUhoZ1MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBUhop1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//DomainSpecification/resourceProperties"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBUho51MEeOAifIf_y6J9w" points="[14, 3, -152, -260]$[14, 185, -152, -78]$[116, 185, -50, -78]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJQegJ1MEeOAifIf_y6J9w" id="(0.6413793103448275,0.9538461538461539)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJQegZ1MEeOAifIf_y6J9w" id="(0.18888888888888888,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBVIsJ1MEeOAifIf_y6J9w" type="3002" source="_PAD9YJ1MEeOAifIf_y6J9w" target="_PAe0JJ1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBVItJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBVItZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBVItp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBVIt51MEeOAifIf_y6J9w" x="-3" y="-16"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBVIsZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBVIsp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//ServiceProviderCatalog/publisher"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBVIs51MEeOAifIf_y6J9w" points="[0, 0, 0, 185]$[0, -185, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJRFkJ1MEeOAifIf_y6J9w" id="(0.5,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJRFkZ1MEeOAifIf_y6J9w" id="(0.9747899159663865,0.26804123711340205)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBVvwJ1MEeOAifIf_y6J9w" type="3002" source="_PAD9YJ1MEeOAifIf_y6J9w" target="_PAFLgp1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBVvxJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBVvxZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBVvxp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBVvx51MEeOAifIf_y6J9w" x="-7" y="18"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBVvwZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBVvwp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//ServiceProviderCatalog/serviceProviders"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBVvw51MEeOAifIf_y6J9w" points="[0, 0, -131, 60]$[131, -60, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJMNEZ1MEeOAifIf_y6J9w" id="(0.5,0.9692307692307692)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJMNEp1MEeOAifIf_y6J9w" id="(0.49612403100775193,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBVvyJ1MEeOAifIf_y6J9w" type="3002" source="_PAFLgp1MEeOAifIf_y6J9w" target="_PAe0JJ1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBWW0J1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBWW0Z1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBWW0p1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBWW051MEeOAifIf_y6J9w" x="-13" y="-17"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBVvyZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBVvyp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//ServiceProvider/publisher"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBVvy51MEeOAifIf_y6J9w" points="[0, 0, 113, 60]$[-113, -60, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJGtgp1MEeOAifIf_y6J9w" id="(0.3333333333333333,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJHUkJ1MEeOAifIf_y6J9w" id="(0.9747899159663865,0.5670103092783505)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBWW1J1MEeOAifIf_y6J9w" type="3002" source="_PAFLgp1MEeOAifIf_y6J9w" target="_PAHAsp1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBW94J1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBW94Z1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBW94p1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBW9451MEeOAifIf_y6J9w" x="-4" y="-13"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBWW1Z1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBWW1p1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//ServiceProvider/services"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBWW151MEeOAifIf_y6J9w" points="[0, 0, -62, 115]$[62, -115, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJHUkZ1MEeOAifIf_y6J9w" id="(0.5038759689922481,0.9538461538461539)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJH7oJ1MEeOAifIf_y6J9w" id="(0.5,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBW95J1MEeOAifIf_y6J9w" type="3002" source="_PAHAsp1MEeOAifIf_y6J9w" target="_O__E6J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBXk8J1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBXk8Z1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBXk8p1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBXk851MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBW95Z1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBW95p1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Service/domainSpecification"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBW9551MEeOAifIf_y6J9w" points="[2, -1, -246, 21]$[73, -31, -175, -9]$[154, -31, -94, -9]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJKX4J1MEeOAifIf_y6J9w" id="(0.9803921568627451,0.11904761904761904)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJKX4Z1MEeOAifIf_y6J9w" id="(0.6620689655172414,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBXk9J1MEeOAifIf_y6J9w" type="3002" source="_PAHAsp1MEeOAifIf_y6J9w" target="_PAYGcJ1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBYMAJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBYMAZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBYMAp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBYMA51MEeOAifIf_y6J9w" x="20" y="18"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBXk9Z1MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBXk9p1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Service/creationFactories"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBXk951MEeOAifIf_y6J9w" points="[-33, 30, 152, -139]$[-186, 30, -1, -139]$[-186, 90, -1, -79]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJIisZ1MEeOAifIf_y6J9w" id="(0.3333333333333333,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJIisp1MEeOAifIf_y6J9w" id="(0.5,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBYMBJ1MEeOAifIf_y6J9w" type="3002" source="_PAHAsp1MEeOAifIf_y6J9w" target="_PAZUlJ1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBYzEJ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBYzEZ1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBYzEp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBYzE51MEeOAifIf_y6J9w" x="-5" y="22"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBYMBZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBYMBp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Service/queryCapabilities"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBYMB51MEeOAifIf_y6J9w" points="[0, 0, 0, 92]$[0, -92, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJJw0J1MEeOAifIf_y6J9w" id="(0.5,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJJw0Z1MEeOAifIf_y6J9w" id="(0.75,0.06172839506172839)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBYzFJ1MEeOAifIf_y6J9w" type="3002" source="_PAHAsp1MEeOAifIf_y6J9w" target="_PAc-8J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBYzGJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBYzGZ1MEeOAifIf_y6J9w" x="-2" y="-22"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBZaIJ1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBZaIZ1MEeOAifIf_y6J9w" x="16" y="-18"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBYzFZ1MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBYzFp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Service/selectionDialogs"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBYzF51MEeOAifIf_y6J9w" points="[17, 18, -97, -183]$[133, 18, 19, -183]$[133, 90, 19, -111]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJJJwJ1MEeOAifIf_y6J9w" id="(0.8333333333333334,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJJJwZ1MEeOAifIf_y6J9w" id="(0.6666666666666666,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBaBMJ1MEeOAifIf_y6J9w" type="3002" source="_PAHAsp1MEeOAifIf_y6J9w" target="_PAc-8J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBaoQJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBaoQZ1MEeOAifIf_y6J9w" x="-13" y="25"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBbPUJ1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBbPUZ1MEeOAifIf_y6J9w" x="5" y="18"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBaBMZ1MEeOAifIf_y6J9w" routing="Rectilinear" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBaBMp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Service/creationDialogs"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBaBM51MEeOAifIf_y6J9w" points="[34, 36, -57, -165]$[96, 36, 5, -165]$[96, 90, 5, -111]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJH7oZ1MEeOAifIf_y6J9w" id="(0.6666666666666666,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJIisJ1MEeOAifIf_y6J9w" id="(0.3333333333333333,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBb2YJ1MEeOAifIf_y6J9w" type="3002" source="_PAIO0J1MEeOAifIf_y6J9w" target="_PAIO0J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBb2ZJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBb2ZZ1MEeOAifIf_y6J9w" x="10" y="23"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBb2Zp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBcdcJ1MEeOAifIf_y6J9w" x="10" y="-14"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBb2YZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBb2Yp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Resource/extends"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBb2Y51MEeOAifIf_y6J9w" points="[50, 0, 50, 0]$[76, 0, 76, 0]$[76, 67, 76, 67]$[0, 67, 0, 67]$[0, 24, 0, 24]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBcdcZ1MEeOAifIf_y6J9w" type="3002" source="_PAIO0J1MEeOAifIf_y6J9w" target="_PAJc8p1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBcddZ1MEeOAifIf_y6J9w" visible="false" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBcddp1MEeOAifIf_y6J9w" x="-10" y="-10"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBcdd51MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBcdeJ1MEeOAifIf_y6J9w" x="22" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBcdcp1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBcdc51MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Resource/resourceProperties"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBcddJ1MEeOAifIf_y6J9w" points="[4, 0, -196, 131]$[200, 0, 0, 131]$[200, -59, 0, 72]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJGtgJ1MEeOAifIf_y6J9w" id="(0.9607843137254902,0.2857142857142857)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBdEgJ1MEeOAifIf_y6J9w" type="3002" source="_PAJc8p1MEeOAifIf_y6J9w" target="_PAIO0J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBdEhJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBdEhZ1MEeOAifIf_y6J9w" x="-13" y="-21"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBdEhp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBdEh51MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBdEgZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBdEgp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//ResourceProperty/range"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBdEg51MEeOAifIf_y6J9w" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJLmAp1MEeOAifIf_y6J9w" id="(0.003703703703703704,0.6413793103448275)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJMNEJ1MEeOAifIf_y6J9w" id="(0.8529411764705882,0.02040816326530612)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBdEiJ1MEeOAifIf_y6J9w" type="3002" source="_PAYGcJ1MEeOAifIf_y6J9w" target="_PAIO0J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBdrkJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBdrkZ1MEeOAifIf_y6J9w" x="-63" y="-5"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBdrkp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBdrk51MEeOAifIf_y6J9w" x="64" y="13"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBdEiZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBdEip1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//CreationFactory/resourceTypes"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBdEi51MEeOAifIf_y6J9w" points="[8, 79, -491, -166]$[8, 245, -491, 0]$[449, 245, -50, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJOpUJ1MEeOAifIf_y6J9w" id="(0.5,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJOpUZ1MEeOAifIf_y6J9w" id="(0.5,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBdrlJ1MEeOAifIf_y6J9w" type="3002" source="_PAZUlJ1MEeOAifIf_y6J9w" target="_PAIO0J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBeSoJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBeSoZ1MEeOAifIf_y6J9w" x="-54" y="-7"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBeSop1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBeSo51MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBdrlZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBdrlp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//QueryCapability/resourceTypes"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBdrl51MEeOAifIf_y6J9w" points="[0, 79, -348, -166]$[0, 180, -348, -65]$[282, 232, -66, -13]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJNbMJ1MEeOAifIf_y6J9w" id="(0.5,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJNbMZ1MEeOAifIf_y6J9w" id="(0.6666666666666666,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_PBeSpJ1MEeOAifIf_y6J9w" type="3002" source="_PAc-8J1MEeOAifIf_y6J9w" target="_PAIO0J1MEeOAifIf_y6J9w">
+ <children xmi:type="notation:Node" xmi:id="_PBe5sJ1MEeOAifIf_y6J9w" type="4011">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBe5sZ1MEeOAifIf_y6J9w" x="-59" y="-19"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_PBe5sp1MEeOAifIf_y6J9w" type="4012">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_PBe5s51MEeOAifIf_y6J9w" x="10" y="10"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_PBeSpZ1MEeOAifIf_y6J9w" lineColor="4210752"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_PBeSpp1MEeOAifIf_y6J9w" fontColor="4210752" fontName="Lucida Grande" fontHeight="10"/>
+ <element xmi:type="ecore:EReference" href="adaptorInterface.ecore#//Dialog/resourceTypes"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_PBeSp51MEeOAifIf_y6J9w" points="[0, 111, -203, -134]$[0, 162, -203, -83]$[120, 210, -83, -35]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJFfYJ1MEeOAifIf_y6J9w" id="(0.4959349593495935,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJGGcJ1MEeOAifIf_y6J9w" id="(0.8333333333333334,1.0)"/>
+ </edges>
+</notation:Diagram>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl
index 292d778..f615e86 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorApplication.mtl
@@ -19,7 +19,7 @@
*******************************************************************************/
/]
-[module generateAdaptorApplication('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateAdaptorApplication('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
@@ -85,9 +85,9 @@ import [javaClassFullNameForService(anAdaptorInterface.serviceProviderCatalog) /
import [javaClassFullNameForService(aServiceProvider)/];
[/for]
-[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaClassFullName(aResource) /];[/for]
+[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]import [javaClassFullName(aResource, anAdaptorInterface) /];[/for]
import [javaInterfaceFullNameForAdaptorConstants(anAdaptorInterface) /];
-[for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services) separator(lineSeparator())]import [javaClassFullName(aService) /];[/for]
+[for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services->sortedBy(x: Service | javaClassFullName(x))) separator(lineSeparator())]import [javaClassFullName(aService) /];[/for]
public class [javaClassNameForAdaptorApplication(anAdaptorInterface) /] extends OslcWinkApplication {
@@ -100,15 +100,15 @@ public class [javaClassNameForAdaptorApplication(anAdaptorInterface) /] extends
{
RESOURCE_CLASSES.addAll(JenaProvidersRegistry.getProviders());
RESOURCE_CLASSES.addAll(Json4JProvidersRegistry.getProviders());
- [for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services) separator(lineSeparator())]RESOURCE_CLASSES.add([javaClassName(aService)/].class);[/for]
- [for (aResource: Resource | relevantResources(anAdaptorInterface)) separator(lineSeparator())]RESOURCE_CLASSES.add([javaClassName(aResource)/].class);[/for]
+ [for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services->sortedBy(x: Service | javaClassName(x))) separator(lineSeparator())]RESOURCE_CLASSES.add([javaClassName(aService)/].class);[/for]
+ [for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name)) separator(lineSeparator())]RESOURCE_CLASSES.add([javaClassName(aResource)/].class);[/for]
RESOURCE_CLASSES.add(Class.forName("org.eclipse.lyo.server.oauth.webapp.services.ConsumersService"));
RESOURCE_CLASSES.add(Class.forName("org.eclipse.lyo.server.oauth.webapp.services.OAuthService"));
//Catalog resources.
RESOURCE_CLASSES.add([javaClassNameForService(anAdaptorInterface.serviceProviderCatalog) /].class);
- [for (aServiceProvider: ServiceProvider | anAdaptorInterface.serviceProviderCatalog.serviceProviders)]
+ [for (aServiceProvider: ServiceProvider | anAdaptorInterface.serviceProviderCatalog.serviceProviders->sortedBy(x: ServiceProvider | javaClassFullNameForService(x)))]
RESOURCE_CLASSES.add([javaClassNameForService(aServiceProvider)/].class);
[/for]
@@ -134,7 +134,7 @@ public class [javaClassNameForAdaptorApplication(anAdaptorInterface) /] extends
System.err.println("[javaClassNameForAdaptorApplication(anAdaptorInterface) /] failed to initialize");
}
- [for (aResource: Resource | relevantResources(anAdaptorInterface))]
+ [for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name))]
RESOURCE_SHAPE_PATH_TO_RESOURCE_CLASS_MAP.put([javaInterfaceNameForAdaptorConstants(anAdaptorInterface) /].[resourcePathConstantName(aResource) /], [javaClassName(aResource)/].class);
[/for]
}
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorConstants.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorConstants.mtl
index 15950b7..df1e189 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorConstants.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorConstants.mtl
@@ -22,11 +22,12 @@
*******************************************************************************/
/]
-[module generateAdaptorConstants('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateAdaptorConstants('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
+[import org::eclipse::lyo::oslc4j::codegenerator::services::domainSpecificationServices/]
[query public generateDomainSpecificationConstants(aDomainSpecification : DomainSpecification) : String =
'public static String '.concat(domainSpecificationConstantName(aDomainSpecification)).concat(' = "').concat(aDomainSpecification.namespaceURI).concat('#";').concat(lineSeparator()).concat('public static String ').concat(domainSpecificationNamespaceConstantName(aDomainSpecification)).concat(' = "').concat(aDomainSpecification.namespaceURI).concat('#";').concat(lineSeparator()).concat('public static String ').concat(domainSpecificationNamespacePrefixConstantName(aDomainSpecification)).concat(' = "').concat(aDomainSpecification.namespacePrefix.name).concat('";').concat(lineSeparator())
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
index 4d29b41..c19edab 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorManager.mtl
@@ -19,7 +19,7 @@
*******************************************************************************/
/]
-[module generateAdaptorManager('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateAdaptorManager('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
@@ -48,7 +48,6 @@
* This file is generated by org.eclipse.lyo.oslc4j.codegenerator
*******************************************************************************/
-
package [javaClassPackageNameForAdaptorManager(anAdaptorInterface) /];
import javax.servlet.http.HttpServletRequest;
@@ -57,7 +56,7 @@ import java.util.List;
import [javaClassFullNameForServiceProviderInfo(anAdaptorInterface) /];
[for (aResource: Resource | relevantResources(anAdaptorInterface)->sortedBy(name))]
- import [javaClassFullName(aResource) /];
+ import [javaClassFullName(aResource, anAdaptorInterface) /];
[/for]
// [protected ('imports')]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl
index e873b27..02c6460 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorPackageInfo.mtl
@@ -21,7 +21,7 @@
*******************************************************************************/
/]
-[module generateAdaptorPackageInfo('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateAdaptorPackageInfo('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
@@ -54,14 +54,13 @@
* This file is generated by org.eclipse.lyo.oslc4j.codegenerator
*******************************************************************************/
-
@OslcSchema ({
@OslcNamespaceDefinition(prefix = OslcConstants.DCTERMS_NAMESPACE_PREFIX, namespaceURI = OslcConstants.DCTERMS_NAMESPACE),
@OslcNamespaceDefinition(prefix = OslcConstants.OSLC_CORE_NAMESPACE_PREFIX, namespaceURI = OslcConstants.OSLC_CORE_NAMESPACE),
@OslcNamespaceDefinition(prefix = OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, namespaceURI = OslcConstants.OSLC_DATA_NAMESPACE),
@OslcNamespaceDefinition(prefix = OslcConstants.RDF_NAMESPACE_PREFIX, namespaceURI = OslcConstants.RDF_NAMESPACE),
@OslcNamespaceDefinition(prefix = OslcConstants.RDFS_NAMESPACE_PREFIX, namespaceURI = OslcConstants.RDFS_NAMESPACE),
- [for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)) separator(','.concat(lineSeparator()))]
+ [for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name)) separator(','.concat(lineSeparator()))]
@OslcNamespaceDefinition(prefix = [javaInterfaceNameForAdaptorConstants(anAdaptorInterface)/].[domainSpecificationNamespacePrefixConstantName(aDomainSpecification) /], namespaceURI = [javaInterfaceNameForAdaptorConstants(anAdaptorInterface)/].[domainSpecificationNamespaceConstantName(aDomainSpecification) /])
[/for]
})
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl
index 8098ba4..99b5390 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServiceProviderFactory.mtl
@@ -22,7 +22,7 @@
*******************************************************************************/
/]
-[module generateAdaptorServiceProviderFactory('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateAdaptorServiceProviderFactory('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
@@ -69,7 +69,7 @@ import org.eclipse.lyo.oslc4j.core.model.ServiceProvider;
import org.eclipse.lyo.oslc4j.core.model.ServiceProviderFactory;
import [javaInterfaceFullNameForAdaptorConstants(anAdaptorInterface) /];
-[for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services)]
+[for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services->sortedBy(x: Service | javaClassFullName(x)))]
import [javaClassFullName(aService) /];
[/for]
@@ -81,7 +81,7 @@ public class [javaClassNameForServiceProviderFactory(anAdaptorInterface) /]
{
private static Class<?>[ '[' ']' /] RESOURCE_CLASSES =
{
- [for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services) separator(', ')]
+ [for (aService: Service | anAdaptorInterface.serviceProviderCatalog.serviceProviders.services->sortedBy(x: Service | javaClassName(x))) separator(', ')]
[javaClassName(aService)/].class
[/for]
};
@@ -120,7 +120,7 @@ public class [javaClassNameForServiceProviderFactory(anAdaptorInterface) /]
new PrefixDefinition(OslcConstants.OSLC_DATA_NAMESPACE_PREFIX, new URI(OslcConstants.OSLC_DATA_NAMESPACE)),
new PrefixDefinition(OslcConstants.RDF_NAMESPACE_PREFIX, new URI(OslcConstants.RDF_NAMESPACE)),
new PrefixDefinition(OslcConstants.RDFS_NAMESPACE_PREFIX, new URI(OslcConstants.RDFS_NAMESPACE)),
- [for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)) separator(','.concat(lineSeparator()))]
+ [for (aDomainSpecification: DomainSpecification | relevantDomainSpecifications(anAdaptorInterface)->sortedBy(name)) separator(','.concat(lineSeparator()))]
new PrefixDefinition([javaInterfaceNameForAdaptorConstants(anAdaptorInterface)/].[domainSpecificationNamespacePrefixConstantName(aDomainSpecification) /], new URI([javaInterfaceNameForAdaptorConstants(anAdaptorInterface)/].[domainSpecificationNamespaceConstantName(aDomainSpecification) /]))
[/for]
};
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl
index b60b62a..e4c9f9d 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateAdaptorServletListener.mtl
@@ -19,7 +19,7 @@
*******************************************************************************/
/]
-[module generateAdaptorServletListener('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateAdaptorServletListener('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
@@ -47,7 +47,6 @@
* This file is generated by org.eclipse.lyo.oslc4j.codegenerator
*******************************************************************************/
-
package [javaClassPackageNameForAdaptorServletListener(anAdaptorInterface) /];
import java.net.InetAddress;
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateDelegatedUIJavaScripts.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateDelegatedUIJavaScripts.mtl
index 0276a5d..0828d89 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateDelegatedUIJavaScripts.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateDelegatedUIJavaScripts.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generateDelegatedUIJavaScripts('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateDelegatedUIJavaScripts('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateFilteredResourceCollectionJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateFilteredResourceCollectionJsp.mtl
index b1b31bb..d8ad3e8 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateFilteredResourceCollectionJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateFilteredResourceCollectionJsp.mtl
@@ -19,14 +19,14 @@
--%>
/]
-[module generateFilteredResourceCollectionJsp('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateFilteredResourceCollectionJsp('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
-[template public generateFilteredResourceCollectionJsp(aResource : Resource)]
-[file (filteredResourceCollectionJspFullFileName(aResource), false, 'UTF-8')]
+[template public generateFilteredResourceCollectionJsp(aResource : Resource, anAdaptorInterface : AdaptorInterface)]
+[file (filteredResourceCollectionJspFullFileName(aResource, anAdaptorInterface), false, 'UTF-8')]
<%--
Copyright (c) 2011, 2012 IBM Corporation and others.
@@ -47,11 +47,10 @@
This file is generated by org.eclipse.lyo.oslc4j.codegenerator
--%>
-
<%@ page import="java.net.*" %>
<%@ page import="java.util.*" %>
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
-<%@page import="[javaClassFullName(aResource) /]"%>
+<%@page import="[javaClassFullName(aResource, anAdaptorInterface) /]"%>
<%--
[protected ('imports')]
--%>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateGetResourceJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateGetResourceJsp.mtl
index d65e4d7..bfeaa71 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateGetResourceJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateGetResourceJsp.mtl
@@ -19,15 +19,15 @@
--%>
/]
-[module generateGetResourceJsp('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateGetResourceJsp('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourcePropertyServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
-[template public generateGetResourceJsp(aResource : Resource)]
-[file (getResourceJspFullFileName(aResource), false, 'UTF-8')]
+[template public generateGetResourceJsp(aResource : Resource, anAdaptorInterface : AdaptorInterface)]
+[file (getResourceJspFullFileName(aResource, anAdaptorInterface), false, 'UTF-8')]
<!DOCTYPE html>
<%--
Copyright (c) 2011, 2012 IBM Corporation and others.
@@ -51,7 +51,7 @@
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
<%@page import="java.util.List" %>
-<%@page import="[javaClassFullName(aResource) /]"%>
+<%@page import="[javaClassFullName(aResource, anAdaptorInterface) /]"%>
<%--
[protected ('imports')]
--%>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResource.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResource.mtl
index 9323c86..95b25f7 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResource.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResource.mtl
@@ -23,15 +23,16 @@
*******************************************************************************/
/]
-[module generateResource('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateResource('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourcePropertyServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
+[import org::eclipse::lyo::oslc4j::codegenerator::services::domainSpecificationServices/]
-[template public generateResource(aResource : Resource)]
-[file (javaClassFullFileName(aResource), false, 'UTF-8')]
+[template public generateResource(aResource : Resource, anAdaptorInterface : AdaptorInterface)]
+[file (javaClassFullFileName(aResource, anAdaptorInterface), false, 'UTF-8')]
/*******************************************************************************
* Copyright (c) 2012 IBM Corporation and others.
*
@@ -57,7 +58,7 @@
*******************************************************************************/
-package [javaClassPackageName(aResource) /];
+package [javaClassPackageName(aResource, anAdaptorInterface) /];
import java.net.URI;
import java.net.URISyntaxException;
@@ -93,12 +94,12 @@ import org.eclipse.lyo.oslc4j.core.model.OslcConstants;
import org.eclipse.lyo.oslc4j.core.model.Representation;
import org.eclipse.lyo.oslc4j.core.model.ValueType;
-import [javaClassFullNameForAdaptorServletListener(aResource.eContainer(AdaptorInterface)) /];
-import [javaInterfaceFullNameForAdaptorConstants(aResource.eContainer(AdaptorInterface)) /];
-[for (aProperty: ResourceProperty | allProperties(aResource))]
+import [javaClassFullNameForAdaptorServletListener(anAdaptorInterface) /];
+import [javaInterfaceFullNameForAdaptorConstants(anAdaptorInterface) /];
+[for (aProperty: ResourceProperty | allProperties(aResource)->sortedBy(name))]
[if(Sequence{'Resource', 'LocalResource'}->includes(aProperty.valueType.toString())) ]
[if (not aProperty.range.oclIsUndefined())]
-import [javaClassFullName(aProperty.range) /];
+import [javaClassFullName(aProperty.range, anAdaptorInterface) /];
[/if]
[/if]
[/for]
@@ -106,9 +107,9 @@ import [javaClassFullName(aProperty.range) /];
// [protected ('imports')]
// [/protected]
-@OslcNamespace([javaInterfaceNameForAdaptorConstants(aResource.eContainer(AdaptorInterface)) /].[domainSpecificationNamespaceConstantName(aResource.definingDomainSpecification()) /])
-@OslcName([javaInterfaceNameForAdaptorConstants(aResource.eContainer(AdaptorInterface)) /].[resourceConstantName(aResource) /])
-@OslcResourceShape(title = "[aResource.name /] Resource Shape", describes = [javaInterfaceNameForAdaptorConstants(aResource.eContainer(AdaptorInterface)) /].[resourceTypeConstantName(aResource) /])
+@OslcNamespace([javaInterfaceNameForAdaptorConstants(anAdaptorInterface) /].[domainSpecificationNamespaceConstantName(aResource.definingDomainSpecification()) /])
+@OslcName([javaInterfaceNameForAdaptorConstants(anAdaptorInterface) /].[resourceConstantName(aResource) /])
+@OslcResourceShape(title = "[aResource.name /] Resource Shape", describes = [javaInterfaceNameForAdaptorConstants(anAdaptorInterface) /].[resourceTypeConstantName(aResource) /])
public class [javaClassName(aResource) /]
extends [parentJavaClassName(aResource) /]
{
@@ -140,7 +141,7 @@ public static URI constructURI(String serviceProviderId, String [aResource.name.
[comment TODO: The URI below should be constructed using the same methods that construct the "@Path" of the services.
These are currently hard coded as well. Change that, so that both use the same source. THis way, if there is a coder-define
customisation of the method, the rest of the code will work fine./]
- return new URI([javaClassNameForAdaptorServletListener(aResource.eContainer(AdaptorInterface))/].getServicesBase() + "/" + serviceProviderId + "/[aResource.name.toLowerFirst() /]s/"+ [aResource.name.toLowerFirst() /]Id);
+ return new URI([javaClassNameForAdaptorServletListener(anAdaptorInterface)/].getServicesBase() + "/" + serviceProviderId + "/[aResource.name.toLowerFirst() /]s/"+ [aResource.name.toLowerFirst() /]Id);
}
public String toString()
@@ -183,12 +184,12 @@ public String toHtml()
[for (aProperty: ResourceProperty | aResource.resourceProperties)]
[nameAnnotation(aProperty) /]
- [propertyDefinitionAnnotation(aProperty, aResource) /]
+ [propertyDefinitionAnnotation(aProperty, aResource, anAdaptorInterface) /]
[descriptionAnnotation(aProperty) /]
[occursAnnotation(aProperty) /]
[valueTypeAnnotation(aProperty) /]
[representationAnnotation(aProperty) /]
- [rangeAnnotation(aProperty, aResource) /]
+ [rangeAnnotation(aProperty, aResource, anAdaptorInterface) /]
[readOnlyAnnotation(aProperty) /]
[titleAnnotation(aProperty) /]
public [javaAttributeTypeDeclaration(aProperty) /] [if (aProperty.valueType.toString() = 'Boolean')]is[else]get[/if][javaAttributeName(aProperty, aResource).toUpperFirst() /]()
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCollectionJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCollectionJsp.mtl
index 3eff998..c5cce54 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCollectionJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCollectionJsp.mtl
@@ -19,14 +19,14 @@
--%>
/]
-[module generateResourceCollectionJsp('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateResourceCollectionJsp('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
-[template public generateResourceCollectionJsp(aResource : Resource)]
-[file (resourceCollectionJspFullFileName(aResource), false, 'UTF-8')]
+[template public generateResourceCollectionJsp(aResource : Resource, anAdaptorInterface : AdaptorInterface)]
+[file (resourceCollectionJspFullFileName(aResource, anAdaptorInterface), false, 'UTF-8')]
<!DOCTYPE html>
<%--
Copyright (c) 2011, 2012 IBM Corporation and others.
@@ -50,7 +50,7 @@
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
<%@page import="java.util.List" %>
-<%@page import="[javaClassFullName(aResource) /]"%>
+<%@page import="[javaClassFullName(aResource, anAdaptorInterface) /]"%>
<%--
[protected ('imports')]
--%>
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCreatorJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCreatorJsp.mtl
index fc4fcf9..8b7fdc3 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCreatorJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceCreatorJsp.mtl
@@ -19,15 +19,15 @@
--%>
/]
-[module generateResourceCreatorJsp('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateResourceCreatorJsp('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourcePropertyServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
-[template public generateResourceCreatorJsp(aResource : Resource)]
-[file (resourceCreatorJspFullFileName(aResource), false, 'UTF-8')]
+[template public generateResourceCreatorJsp(aResource : Resource, anAdaptorInterface : AdaptorInterface)]
+[file (resourceCreatorJspFullFileName(aResource, anAdaptorInterface), false, 'UTF-8')]
<!DOCTYPE html>
<%--
Copyright (c) 2011, 2012 IBM Corporation and others.
@@ -51,7 +51,7 @@
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
<%@page import="java.util.List" %>
-<%@page import="[javaClassFullName(aResource) /]"%>
+<%@page import="[javaClassFullName(aResource, anAdaptorInterface) /]"%>
<%--
[protected ('imports')]
--%>
@@ -98,7 +98,7 @@
best possibility to modify the generated stuff. (hiding fields, changing the format, removing fields, etc.)/]
[for (aProperty: ResourceProperty | allProperties(aResource))]
<tr>
- <td><%= [javaClassName(aResource)/].[javaAttributeName(aProperty, aResource) /]ToHtmlForCreation(request, serviceProvider.getIdentifier())%></td>
+ <td><%= [javaClassName(aResource)/].[javaAttributeName(aProperty, aResource) /]AsHtmlForCreation(request, serviceProvider.getIdentifier())%></td>
</tr>
[/for]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceSelectorJsp.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceSelectorJsp.mtl
index 3a2ced7..514fcf8 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceSelectorJsp.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateResourceSelectorJsp.mtl
@@ -19,15 +19,15 @@
--%>
/]
-[module generateResourceSelectorJsp('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateResourceSelectorJsp('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourcePropertyServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
-[template public generateResourceSelectorJsp(aResource : Resource)]
-[file (resourceSelectorJspFullFileName(aResource), false, 'UTF-8')]
+[template public generateResourceSelectorJsp(aResource : Resource, anAdaptorInterface : AdaptorInterface)]
+[file (resourceSelectorJspFullFileName(aResource, anAdaptorInterface), false, 'UTF-8')]
<!DOCTYPE html>
<%--
Copyright (c) 2011, 2012 IBM Corporation and others.
@@ -50,7 +50,7 @@
--%>
<%@page import="org.eclipse.lyo.oslc4j.core.model.ServiceProvider"%>
-<%@page import="[javaClassFullName(aResource) /]"%>
+<%@page import="[javaClassFullName(aResource, anAdaptorInterface) /]"%>
<%--
[protected ('imports')]
--%>
@@ -84,7 +84,7 @@
[/protected]
--%>
[comment TODO: I need to work out how to properly set hte javascript path. This is hard-coded :-)/]
- <script type="text/javascript" src="../../../[delegatedUIJavaScriptsRelativeFileName(aResource.eContainer(AdaptorInterface)) /]"></script>
+ <script type="text/javascript" src="../../../[delegatedUIJavaScriptsRelativeFileName(anAdaptorInterface) /]"></script>
</head>
[comment TODO: make a more powerfull/flexible search form, by allowing user to entry values on each resource property, and not just "summary" as is expected here./]
<body style="padding: 10px;">
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateService.mtl
index 9609c27..4a81ec6 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateService.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateService.mtl
@@ -19,7 +19,7 @@
*******************************************************************************/
/]
-[module generateService('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateService('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
@@ -35,7 +35,7 @@
[import org::eclipse::lyo::oslc4j::codegenerator::files::generateResourceCreatorJsp/]
[import org::eclipse::lyo::oslc4j::codegenerator::files::generateResourceSelectorJsp/]
-[template public generateService(aService : Service)]
+[template public generateService(aService : Service, anAdaptorInterface : AdaptorInterface)]
[file (javaClassFullFileName(aService), false, 'UTF-8')]
/*******************************************************************************
* Copyright (c) 2012 IBM Corporation and others.
@@ -108,12 +108,13 @@ import org.eclipse.lyo.oslc4j.core.model.Link;
import [javaClassFullNameForAdaptorManager(containingAdaptorInterface(aService)) /];
import [javaInterfaceFullNameForAdaptorConstants(containingAdaptorInterface(aService)) /];
import [javaClassFullNameForSingleton(containingServiceProviderCatalog(aService)) /];
-import [javaClassFullName(coveredResource(aService)) /];
+import [javaClassFullName(coveredResource(aService), anAdaptorInterface) /];
-[for (aProperty: ResourceProperty | allProperties(coveredResource(aService)))]
+[for (aProperty: ResourceProperty | allProperties(coveredResource(aService))->sortedBy(name))]
[if(Sequence{'Resource', 'LocalResource'}->includes(aProperty.valueType.toString())) ]
[if (not aProperty.range.oclIsUndefined())]
-import [javaClassFullName(aProperty.range) /];
+
+import [javaClassFullName(aProperty.range, anAdaptorInterface) /];
[/if]
[/if]
[/for]
@@ -246,8 +247,8 @@ public class [javaClassName(aService) /]
ServiceProvider serviceProvider = [javaClassNameForSingleton(containingServiceProviderCatalog(aService)) /].getServiceProvider(httpServletRequest, serviceProviderId);
httpServletRequest.setAttribute("serviceProvider", serviceProvider);
- RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[resourceCollectionJspRelativeFileName(coveredResource(aService)) /]");
- [coveredResource(aService).generateResourceCollectionJsp() /]
+ RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[resourceCollectionJspRelativeFileName(coveredResource(aService), anAdaptorInterface) /]");
+ [coveredResource(aService).generateResourceCollectionJsp(anAdaptorInterface) /]
rd.forward(httpServletRequest,httpServletResponse);
}
@@ -326,8 +327,8 @@ public class [javaClassName(aService) /]
ServiceProvider serviceProvider = [javaClassNameForSingleton(containingServiceProviderCatalog(aService)) /].getServiceProvider(httpServletRequest, serviceProviderId);
httpServletRequest.setAttribute("serviceProvider", serviceProvider);
- RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[getResourceJspRelativeFileName(coveredResource(aService)) /]");
- [coveredResource(aService).generateGetResourceJsp() /]
+ RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[getResourceJspRelativeFileName(coveredResource(aService), anAdaptorInterface) /]");
+ [coveredResource(aService).generateGetResourceJsp(anAdaptorInterface) /]
rd.forward(httpServletRequest,httpServletResponse);
@@ -374,8 +375,8 @@ public class [javaClassName(aService) /]
final List<[javaClassName(coveredResource(aService)) /]> resources = [javaClassNameForAdaptorManager(containingAdaptorInterface(aService)) /].search[coveredResource(aService).name.toUpperFirst() /]s(httpServletRequest, serviceProviderId, terms);
if (resources!= null) {
httpServletRequest.setAttribute("resources", resources);
- RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[filteredResourceCollectionJspRelativeFileName(coveredResource(aService)) /]");
- [coveredResource(aService).generateFilteredResourceCollectionJsp() /]
+ RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[filteredResourceCollectionJspRelativeFileName(coveredResource(aService), anAdaptorInterface) /]");
+ [coveredResource(aService).generateFilteredResourceCollectionJsp(anAdaptorInterface) /]
rd.forward(httpServletRequest, httpServletResponse);
}
//a empty search should return an empty list and not NULL!
@@ -383,8 +384,8 @@ public class [javaClassName(aService) /]
} else {
try {
- RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[resourceSelectorJspRelativeFileName(coveredResource(aService)) /]");
- [coveredResource(aService).generateResourceSelectorJsp() /]
+ RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[resourceSelectorJspRelativeFileName(coveredResource(aService), anAdaptorInterface) /]");
+ [coveredResource(aService).generateResourceSelectorJsp(anAdaptorInterface) /]
rd.forward(httpServletRequest, httpServletResponse);
} catch (Exception e) {
@@ -419,8 +420,8 @@ public class [javaClassName(aService) /]
ServiceProvider serviceProvider = [javaClassNameForSingleton(containingServiceProviderCatalog(aService)) /].getServiceProvider(httpServletRequest, serviceProviderId);
httpServletRequest.setAttribute("serviceProvider", serviceProvider);
- RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[resourceCreatorJspRelativeFileName(coveredResource(aService)) /]");
- [coveredResource(aService).generateResourceCreatorJsp() /]
+ RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[resourceCreatorJspRelativeFileName(coveredResource(aService), anAdaptorInterface) /]");
+ [coveredResource(aService).generateResourceCreatorJsp(anAdaptorInterface) /]
rd.forward(httpServletRequest, httpServletResponse);
}
@@ -529,9 +530,7 @@ public class [javaClassName(aService) /]
@Produces({OslcMediaType.APPLICATION_RDF_XML, OslcMediaType.APPLICATION_XML, OslcMediaType.APPLICATION_JSON})
public Response addChangeRequest(@PathParam("productId") final String productId,
final [javaClassName(coveredResource(aService)) /] a[coveredResource(aService).name.toUpperFirst() /]) throws IOException, ServletException
-
{
-
return null; // See LAB 5 of the Lyo workshop for implementation
}
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogHTML.mtl
index f41b2e5..b34b18f 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogHTML.mtl
@@ -19,7 +19,7 @@
--%>
/]
-[module generateServiceProviderCatalogHTML('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateServiceProviderCatalogHTML('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl
index 7d46bab..164fef8 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogService.mtl
@@ -22,7 +22,7 @@
*******************************************************************************/
/]
-[module generateServiceProviderCatalogService('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateServiceProviderCatalogService('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::serviceProviderCatalogServices/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl
index eecf6bf..b73deaa 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderCatalogSingleton.mtl
@@ -22,7 +22,7 @@
*******************************************************************************/
/]
-[module generateServiceProviderCatalogSingleton('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateServiceProviderCatalogSingleton('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::serviceProviderCatalogServices/]
@@ -53,7 +53,6 @@
* This file is generated by org.eclipse.lyo.oslc4j.codegenerator
*******************************************************************************/
-
package [javaClassPackageNameForSingleton(aServiceProviderCatalog) /];
import java.net.URI;
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderHTML.mtl
index 944ee45..e11f004 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderHTML.mtl
@@ -19,13 +19,13 @@
--%>
/]
-[module generateServiceProviderHTML('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateServiceProviderHTML('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
-[template public generateServiceProviderHTML(aServiceProvider : ServiceProvider)]
-[file (serviceProviderJspFullFileName(aServiceProvider), false, 'UTF-8')]
+[template public generateServiceProviderHTML(aServiceProvider : ServiceProvider, anAdaptorInterface : AdaptorInterface)]
+[file (serviceProviderJspFullFileName(aServiceProvider, anAdaptorInterface), false, 'UTF-8')]
<!DOCTYPE html>
<%--
Copyright (c) 2011, 2012 IBM Corporation and others.
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderInfo.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderInfo.mtl
index 239a57c..529e19d 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderInfo.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderInfo.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generateServiceProviderInfo('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateServiceProviderInfo('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl
index 2b1d501..1464856 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/files/generateServiceProviderService.mtl
@@ -22,7 +22,7 @@
*******************************************************************************/
/]
-[module generateServiceProviderService('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateServiceProviderService('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::jspServices/]
@@ -30,7 +30,7 @@
[import org::eclipse::lyo::oslc4j::codegenerator::services::serviceProviderServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::serviceProviderCatalogServices/]
-[template public generateServiceProviderService(aServiceProvider : ServiceProvider)]
+[template public generateServiceProviderService(aServiceProvider : ServiceProvider, anAdaptorInterface : AdaptorInterface)]
[file (javaClassFullFileNameForService(aServiceProvider), false, 'UTF-8')]
/*******************************************************************************
* Copyright (c) 2012 IBM Corporation and others.
@@ -165,7 +165,7 @@ public class [javaClassNameForService(aServiceProvider) /]
// [protected ('getHtmlServiceProvider_setAttributes')]
// [/protected]
- RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[serviceProviderJspRelativeFileName(aServiceProvider) /]");
+ RequestDispatcher rd = httpServletRequest.getRequestDispatcher("[serviceProviderJspRelativeFileName(aServiceProvider, anAdaptorInterface) /]");
try {
rd.forward(httpServletRequest, httpServletResponse);
} catch (Exception e) {
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/main/generate.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/main/generate.mtl
index 4457020..946ce81 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/main/generate.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/main/generate.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generate('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generate('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
@@ -62,14 +62,14 @@
[anAdaptorInterface.serviceProviderCatalog.generateServiceProviderCatalogHTML() /]
[for (aResource: Resource | relevantResources(anAdaptorInterface))]
- [aResource.generateResource() /]
+ [aResource.generateResource(anAdaptorInterface) /]
[/for]
[for (aServiceProvider: ServiceProvider | anAdaptorInterface.serviceProviderCatalog.serviceProviders)]
- [aServiceProvider.generateServiceProviderService()/]
- [aServiceProvider.generateServiceProviderHTML() /]
+ [aServiceProvider.generateServiceProviderService(anAdaptorInterface)/]
+ [aServiceProvider.generateServiceProviderHTML(anAdaptorInterface) /]
[for (aService: Service | aServiceProvider.services)]
- [aService.generateService()/]
+ [aService.generateService(anAdaptorInterface)/]
[/for]
[/for]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/Services.java b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/Services.java
new file mode 100644
index 0000000..29fb2cc
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/Services.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+Copyright (c) 2013 Jad El-khoury
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+
+The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at
+http://www.eclipse.org/org/documents/edl-v10.php.
+
+Contributors:
+
+ Jad El-khoury - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.lyo.oslc4j.codegenerator.services;
+
+public class Services {
+
+ public String OBS_attributeTypeDeclaration(String valueType, String occurs, String range) {
+ String type = "";
+ switch (valueType) {
+ case ("Boolean"):
+ case ("String"):
+ type = valueType;
+ break;
+ case ("DateTime"):
+ type = "Date";
+ break;
+ case ("URI"):
+ type = "java.net.URI";
+ break;
+ case ("Resource"):
+ type = range;
+ break;
+ }
+
+ if (occurs.equals("zeroOrMany") || (occurs.equals("oneOrMany"))) {
+ type = "java.util.ArrayList<" + type + ">";
+ }
+
+ return type;
+ }
+
+} \ No newline at end of file
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/adaptorInterfaceServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/adaptorInterfaceServices.mtl
index d19df42..7eaf447 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/adaptorInterfaceServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/adaptorInterfaceServices.mtl
@@ -18,21 +18,33 @@
*******************************************************************************/
/]
-[module adaptorInterfaceServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module adaptorInterfaceServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
+[import org::eclipse::lyo::oslc4j::codegenerator::services::serviceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
+[import org::eclipse::lyo::oslc4j::codegenerator::services::domainSpecificationServices/]
+[comment TODO: we should avoid relying on "eContainer", since objects that come from a composing emf file, will not have the eContainer relationship setup as expected.
+This method should be able to work even for objects that come from a differnet emf file than that containing the AdaptorInterface.
+You should also question any other use of "eContainer" in this whole project /]
[query public containingAdaptorInterface(obj : OclAny) : AdaptorInterface =
obj.eContainer(AdaptorInterface)
/]
[query public relevantResources(anAdaptorInterface : AdaptorInterface) : Set(Resource) =
-relevantDomainSpecifications(anAdaptorInterface)->collectNested(aDomainSpecification : DomainSpecification | aDomainSpecification.resources)->flatten()->asSet()
+anAdaptorInterface.serviceProviderCatalog.serviceProviders.services->collectNested(aService : Service |
+ managedResources(aService)
+ ->union(managedResources(aService).extends->select(aResource : Resource | not aResource.oclIsUndefined()))
+ ->union(managedResources(aService)->collectNested(aResource : Resource | aResource.allProperties()->select(aProperty : ResourceProperty | not aProperty.range.oclIsUndefined()).range)->flatten())
+)->flatten()->asSet()
/]
[query public relevantDomainSpecifications(anAdaptorInterface : AdaptorInterface) : Set(DomainSpecification) =
-anAdaptorInterface.specification.domainSpecifications
+relevantResources(anAdaptorInterface)->collectNested(aResource : Resource |
+ definingDomainSpecification(aResource)
+ ->union(aResource.allProperties()->collectNested(aResourceProperty : ResourceProperty | aResourceProperty.definingDomainSpecification()))
+)->flatten()->asSet()
/]
[comment Services for AdaptorPackageInfo /]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/domainSpecificationServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/domainSpecificationServices.mtl
new file mode 100644
index 0000000..4fad4dc
--- /dev/null
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/domainSpecificationServices.mtl
@@ -0,0 +1,30 @@
+[comment encoding = UTF-8 /]
+[comment
+/*******************************************************************************
+ * Copyright (c) 2014 Jad El-khoury.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *
+ * Jad El-khoury - initial implementation of code generator (https://bugs.eclipse.org/bugs/show_bug.cgi?id=422448)
+ *
+ *******************************************************************************/
+/]
+
+[module domainSpecificationServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
+
+[query public definingDomainSpecification(aProperty: ResourceProperty) : DomainSpecification =
+aProperty.eContainer(DomainSpecification)
+/]
+
+[query public definingDomainSpecification(aResource: Resource) : DomainSpecification =
+aResource.eContainer(DomainSpecification)
+/]
+
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/jspServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/jspServices.mtl
index 4962b8b..03a3854 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/jspServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/jspServices.mtl
@@ -18,44 +18,44 @@
*******************************************************************************/
/]
-[module jspServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module jspServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
-[query public filteredResourceCollectionJspRelativeFileName(aResource: Resource) : String =
-jspFilesWebappPath(aResource.eContainer(AdaptorInterface)).concat('/').concat(aResource.name.toLower()).concat('filteredcollection_json').concat('.jsp')
+[query public filteredResourceCollectionJspRelativeFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesWebappPath(anAdaptorInterface).concat('/').concat(aResource.name.toLower()).concat('filteredcollection_json').concat('.jsp')
/]
-[query public filteredResourceCollectionJspFullFileName(aResource: Resource) : String =
-jspFilesBasePath(aResource.eContainer(AdaptorInterface)).concat(filteredResourceCollectionJspRelativeFileName(aResource))
+[query public filteredResourceCollectionJspFullFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesBasePath(anAdaptorInterface).concat(filteredResourceCollectionJspRelativeFileName(aResource, anAdaptorInterface))
/]
-[query public resourceCollectionJspRelativeFileName(aResource: Resource) : String =
-jspFilesWebappPath(aResource.eContainer(AdaptorInterface)).concat('/').concat(aResource.name.toLower()).concat('collection_html').concat('.jsp')
+[query public resourceCollectionJspRelativeFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesWebappPath(anAdaptorInterface).concat('/').concat(aResource.name.toLower()).concat('collection_html').concat('.jsp')
/]
-[query public resourceCollectionJspFullFileName(aResource: Resource) : String =
-jspFilesBasePath(aResource.eContainer(AdaptorInterface)).concat(resourceCollectionJspRelativeFileName(aResource))
+[query public resourceCollectionJspFullFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesBasePath(anAdaptorInterface).concat(resourceCollectionJspRelativeFileName(aResource, anAdaptorInterface))
/]
-[query public getResourceJspRelativeFileName(aResource: Resource) : String =
-jspFilesWebappPath(aResource.eContainer(AdaptorInterface)).concat('/').concat(aResource.name.toLower()).concat('_html').concat('.jsp')
+[query public getResourceJspRelativeFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesWebappPath(anAdaptorInterface).concat('/').concat(aResource.name.toLower()).concat('_html').concat('.jsp')
/]
-[query public getResourceJspFullFileName(aResource: Resource) : String =
-jspFilesBasePath(aResource.eContainer(AdaptorInterface)).concat(getResourceJspRelativeFileName(aResource))
+[query public getResourceJspFullFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesBasePath(anAdaptorInterface).concat(getResourceJspRelativeFileName(aResource, anAdaptorInterface))
/]
-[query public resourceCreatorJspRelativeFileName(aResource: Resource) : String =
-jspFilesWebappPath(aResource.eContainer(AdaptorInterface)).concat('/').concat(aResource.name.toLower()).concat('creator_html').concat('.jsp')
+[query public resourceCreatorJspRelativeFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesWebappPath(anAdaptorInterface).concat('/').concat(aResource.name.toLower()).concat('creator_html').concat('.jsp')
/]
-[query public resourceCreatorJspFullFileName(aResource: Resource) : String =
-jspFilesBasePath(aResource.eContainer(AdaptorInterface)).concat(resourceCreatorJspRelativeFileName(aResource))
+[query public resourceCreatorJspFullFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesBasePath(anAdaptorInterface).concat(resourceCreatorJspRelativeFileName(aResource, anAdaptorInterface))
/]
-[query public resourceSelectorJspRelativeFileName(aResource: Resource) : String =
-jspFilesWebappPath(aResource.eContainer(AdaptorInterface)).concat('/').concat(aResource.name.toLower()).concat('selector_html').concat('.jsp')
+[query public resourceSelectorJspRelativeFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesWebappPath(anAdaptorInterface).concat('/').concat(aResource.name.toLower()).concat('selector_html').concat('.jsp')
/]
-[query public resourceSelectorJspFullFileName(aResource: Resource) : String =
-jspFilesBasePath(aResource.eContainer(AdaptorInterface)).concat(resourceSelectorJspRelativeFileName(aResource))
+[query public resourceSelectorJspFullFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesBasePath(anAdaptorInterface).concat(resourceSelectorJspRelativeFileName(aResource, anAdaptorInterface))
/]
[query public serviceProviderCatalogJspRelativeFileName(aServiceProviderCatalog : ServiceProviderCatalog) : String =
@@ -65,11 +65,11 @@ jspFilesWebappPath(containingAdaptorInterface(aServiceProviderCatalog)).concat('
jspFilesBasePath(containingAdaptorInterface(aServiceProviderCatalog)).concat(serviceProviderCatalogJspRelativeFileName(aServiceProviderCatalog))
/]
-[query public serviceProviderJspRelativeFileName(aServiceProvider : ServiceProvider) : String =
-jspFilesWebappPath(aServiceProvider.eContainer(AdaptorInterface)).concat('/').concat('serviceProvider_html').concat('.jsp')
+[query public serviceProviderJspRelativeFileName(aServiceProvider : ServiceProvider, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesWebappPath(anAdaptorInterface).concat('/').concat('serviceProvider_html').concat('.jsp')
/]
-[query public serviceProviderJspFullFileName(aServiceProvider : ServiceProvider) : String =
-jspFilesBasePath(aServiceProvider.eContainer(AdaptorInterface)).concat(serviceProviderJspRelativeFileName())
+[query public serviceProviderJspFullFileName(aServiceProvider : ServiceProvider, anAdaptorInterface : AdaptorInterface) : String =
+jspFilesBasePath(anAdaptorInterface).concat(serviceProviderJspRelativeFileName(aServiceProvider, anAdaptorInterface))
/]
[comment TODO: I need to work out how to properly set hte javascript path. This is hard-coded :-)/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourcePropertyServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourcePropertyServices.mtl
index b6a3ecd..50e3939 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourcePropertyServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourcePropertyServices.mtl
@@ -18,14 +18,11 @@
*******************************************************************************/
/]
-[module resourcePropertyServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module resourcePropertyServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::resourceServices/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
-
-[query public definingDomainSpecification(aProperty: ResourceProperty) : DomainSpecification =
-aProperty.eContainer(DomainSpecification)
-/]
+[import org::eclipse::lyo::oslc4j::codegenerator::services::domainSpecificationServices/]
[comment TODO: "URI" should actually not be a valueType since it is not OSLC-standard. However, this is one way to allow user to specify a URI as a type.
Another approach would be to have a valueType as String, and the Range being set to "URI", hence creating a URI (local) resource?
@@ -38,8 +35,8 @@ not (Sequence{'URI'}->includes(aProperty.valueType.toString()))
'@OslcName("'.concat(aProperty.name). concat('")')
/]
-[query public propertyDefinitionAnnotation(aProperty: ResourceProperty, aResource: Resource) : String =
-'@OslcPropertyDefinition('.concat(javaInterfaceNameForAdaptorConstants(aResource.eContainer(AdaptorInterface))).concat('.').concat(domainSpecificationNamespaceConstantName(aProperty.definingDomainSpecification())) . concat(' + "').concat(aProperty.name).concat('")')
+[query public propertyDefinitionAnnotation(aProperty: ResourceProperty, aResource: Resource, anAdaptorInterface: AdaptorInterface) : String =
+'@OslcPropertyDefinition('.concat(javaInterfaceNameForAdaptorConstants(anAdaptorInterface)).concat('.').concat(domainSpecificationNamespaceConstantName(aProperty.definingDomainSpecification())) . concat(' + "').concat(aProperty.name).concat('")')
/]
[query public descriptionAnnotation(aProperty: ResourceProperty) : String =
@@ -98,9 +95,9 @@ else
endif)
/]
-[query public rangeAnnotation(aProperty: ResourceProperty, aResource: Resource) : String =
+[query public rangeAnnotation(aProperty: ResourceProperty, aResource: Resource, anAdaptorInterface: AdaptorInterface) : String =
(if (not aProperty.range.oclIsUndefined()) then
- '@OslcRange('.concat(javaInterfaceNameForAdaptorConstants(aResource.eContainer(AdaptorInterface))).concat('.').concat(resourceTypeConstantName(aProperty.range)).concat(')')
+ '@OslcRange('.concat(javaInterfaceNameForAdaptorConstants(anAdaptorInterface)).concat('.').concat(resourceTypeConstantName(aProperty.range)).concat(')')
else
''
endif)
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourceServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourceServices.mtl
index 461614a..c9b934f 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourceServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/resourceServices.mtl
@@ -18,17 +18,10 @@
*******************************************************************************/
/]
-[module resourceServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module resourceServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
-
-[query public definingDomainSpecification(aResource: Resource) : DomainSpecification =
-aResource.eContainer(DomainSpecification)
-/]
-
-[query public adaptorInterface(aResource: Resource) : AdaptorInterface =
-aResource.eContainer(AdaptorInterface)
-/]
+[import org::eclipse::lyo::oslc4j::codegenerator::services::domainSpecificationServices/]
[query public allProperties(aResource: Resource) : Set(ResourceProperty) =
aResource.resourceProperties->union(inheritedProperties(aResource))
@@ -52,20 +45,20 @@ Make sure this query and the Constants generation are based on the same set of b
aResource.definingDomainSpecification().namespaceURI.concat('#').concat(aResource.name)
/]
-[query public javaClassPackageName(aResource: Resource) : String =
-javaClassBaseNamespace(adaptorInterface(aResource)).concat('.resources')
+[query public javaClassPackageName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+javaClassBaseNamespace(anAdaptorInterface).concat('.resources')
/]
[query public javaClassName(aResource: Resource) : String =
aResource.name.toUpperFirst()
/]
-[query public javaClassFullName(aResource: Resource) : String =
-javaClassPackageName(aResource).concat('.').concat(javaClassName(aResource))
+[query public javaClassFullName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+javaClassPackageName(aResource, anAdaptorInterface).concat('.').concat(javaClassName(aResource))
/]
-[query public javaClassFullFileName(aResource: Resource) : String =
-javaFilesBasePath(adaptorInterface(aResource)).concat(javaClassPackageName(aResource).substituteAll('.', '/')).concat('/').concat(javaClassName(aResource)).concat('.java')
+[query public javaClassFullFileName(aResource: Resource, anAdaptorInterface : AdaptorInterface) : String =
+javaFilesBasePath(anAdaptorInterface).concat(javaClassPackageName(aResource, anAdaptorInterface).substituteAll('.', '/')).concat('/').concat(javaClassName(aResource)).concat('.java')
/]
[template public parentJavaClassName(aResource: Resource)]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderCatalogServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderCatalogServices.mtl
index 75783ba..a7e0f2d 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderCatalogServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderCatalogServices.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module serviceProviderCatalogServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module serviceProviderCatalogServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderServices.mtl
index 717ef13..9a0be84 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceProviderServices.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module serviceProviderServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module serviceProviderServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceServices.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceServices.mtl
index ecd98c5..9640842 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceServices.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/serviceServices.mtl
@@ -18,13 +18,15 @@
*******************************************************************************/
/]
-[module serviceServices('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module serviceServices('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
-[import org::eclipse::lyo::oslc4j::codegenerator::services::adaptorInterfaceServices/]
-[comment Services for service /]
+[query public containingAdaptorInterface(aService: Service) : AdaptorInterface =
+aService.eContainer(AdaptorInterface)
+/]
+[comment Services for service /]
[query public managedResources(aService: Service) : Set(Resource) =
aService.creationFactories.resourceTypes->asSet()
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/services.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/services.mtl
index e9a8489..de14b9f 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/services.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/services/services.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module services('org.eclipse.lyo.oslc4j.adaptorInterface')/]
+[module services('http://org.eclipse.lyo/oslc4j/adaptorInterface')/]
[query public javaClassBaseNamespace(anAdaptorInterface : AdaptorInterface) : String =
anAdaptorInterface.javaClassBaseNamespace
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEDLV10HTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEDLV10HTML.mtl
index 3839cc6..72d67b0 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEDLV10HTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEDLV10HTML.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generateEDLV10HTML('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateEDLV10HTML('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEPLV10HTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEPLV10HTML.mtl
index f8f36b3..0685c06 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEPLV10HTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateEPLV10HTML.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generateEPLV10HTML('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateEPLV10HTML('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateLicenseFiles.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateLicenseFiles.mtl
index 34cba5c..3becfc7 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateLicenseFiles.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateLicenseFiles.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generateLicenseFiles('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateLicenseFiles('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]
[import org::eclipse::lyo::oslc4j::codegenerator::staticFiles::generateNoticeHTML/]
diff --git a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateNoticeHTML.mtl b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateNoticeHTML.mtl
index f9143e6..bd4a24c 100644
--- a/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateNoticeHTML.mtl
+++ b/org.eclipse.lyo.oslc4j.codegenerator/src/org/eclipse/lyo/oslc4j/codegenerator/staticFiles/generateNoticeHTML.mtl
@@ -18,7 +18,7 @@
*******************************************************************************/
/]
-[module generateNoticeHTML('org.eclipse.lyo.oslc4j.adaptorInterface')]
+[module generateNoticeHTML('http://org.eclipse.lyo/oslc4j/adaptorInterface')]
[import org::eclipse::lyo::oslc4j::codegenerator::services::services/]