Commit 244522ae authored by Nicolas Dolet's avatar Nicolas Dolet
Browse files

- Rename maven artifact "plugin-model" to "frascati-model".

- Change XML namespace to "http://frascati.ow2.org/xmlns/sca/1.1".
- Update examples.
parent 282c8018
......@@ -431,8 +431,8 @@
<dependency>
<groupId>org.ow2.frascati.model</groupId>
<artifactId>plugin-model</artifactId>
<version>1.1-SNAPSHOT</version>
<artifactId>frascati-model</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
......
<?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="plugin"
nsURI="http://frascati.ow2.org/plugin" nsPrefix="frascati-plugin">
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="model"
nsURI="http://frascati.ow2.org/xmlns/sca/1.1" nsPrefix="frascati-model">
<eClassifiers xsi:type="ecore:EClass" name="DocumentRoot" eSuperTypes="platform:/plugin/org.eclipse.stp.sca/model/sca.ecore#//DocumentRoot">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="name" value=""/>
......
......@@ -2,18 +2,18 @@
<genmodel:GenModel xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.ow2.frascati.model/src"
modelPluginID="org.ow2.frascati.model" modelName="Frascati-plugin" importerID="org.eclipse.emf.importer.ecore"
modelPluginID="org.ow2.frascati.model" modelName="Frascati-model" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.stp.sca/model/sca.genmodel#//sca platform:/plugin/org.eclipse.stp.sca/model/sca.genmodel#//policy platform:/plugin/org.eclipse.stp.sca/model/sca.genmodel#//instance">
<foreignModel>frascati-plugin.ecore</foreignModel>
<genPackages prefix="Plugin" basePackage="org.ow2.frascati.model" resource="XML"
disposableProviderFactory="true" ecorePackage="frascati-plugin.ecore#/">
<genClasses ecoreClass="frascati-plugin.ecore#//DocumentRoot">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference frascati-plugin.ecore#//DocumentRoot/implementationOsgi"/>
<foreignModel>frascati-model.ecore</foreignModel>
<genPackages prefix="Model" basePackage="org.ow2.frascati.model" resource="XML"
disposableProviderFactory="true" ecorePackage="frascati-model.ecore#/">
<genClasses ecoreClass="frascati-model.ecore#//DocumentRoot">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference frascati-model.ecore#//DocumentRoot/implementationOsgi"/>
</genClasses>
<genClasses ecoreClass="frascati-plugin.ecore#//OsgiImplementation">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute frascati-plugin.ecore#//OsgiImplementation/bundle"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute frascati-plugin.ecore#//OsgiImplementation/anyAttribute"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute frascati-plugin.ecore#//OsgiImplementation/group"/>
<genClasses ecoreClass="frascati-model.ecore#//OsgiImplementation">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute frascati-model.ecore#//OsgiImplementation/bundle"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute frascati-model.ecore#//OsgiImplementation/anyAttribute"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute frascati-model.ecore#//OsgiImplementation/group"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
......@@ -4,5 +4,5 @@
#
# $Id$
pluginName = frascati-plugin model
pluginName = frascati model
providerName = http://frascati.ow2.org
......@@ -12,7 +12,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri="http://frascati.ow2.org/plugin"
uri="http://frascati.ow2.org/model"
class="org.ow2.frascati.model.plugin.PluginPackage"
genModel="model/frascati-plugin.genmodel"/>
</extension>
......
......@@ -31,7 +31,7 @@
</parent>
<groupId>org.ow2.frascati.model</groupId>
<artifactId>plugin-model</artifactId>
<artifactId>frascati-model</artifactId>
<version>1.1-SNAPSHOT</version>
<!-- ===================== -->
......
......@@ -43,7 +43,7 @@ public interface PluginPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
String eNS_URI = "http://frascati.ow2.org/plugin";
String eNS_URI = "http://frascati.ow2.org/xmlns/sca/1.1";
/**
* The package namespace name.
......
......@@ -31,7 +31,7 @@ public class PluginFactoryImpl extends EFactoryImpl implements PluginFactory {
*/
public static PluginFactory init() {
try {
PluginFactory thePluginFactory = (PluginFactory)EPackage.Registry.INSTANCE.getEFactory("http://frascati.ow2.org/plugin");
PluginFactory thePluginFactory = (PluginFactory)EPackage.Registry.INSTANCE.getEFactory("http://frascati.ow2.org/xmlns/sca/1.1");
if (thePluginFactory != null) {
return thePluginFactory;
}
......
......@@ -24,7 +24,7 @@
<composite name="counter-client"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:frascati="http://frascati.ow2.org/plugin"
xmlns:frascati="http://frascati.ow2.org/xmlns/sca/1.1"
targetNamespace="http://frascati.ow2.org/counter">
<service name="r" promote="client/Runnable"/>
......
......@@ -24,7 +24,7 @@
<composite name="counter-server"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:frascati="http://frascati.ow2.org/plugin"
xmlns:frascati="http://frascati.ow2.org/xmlns/sca/1.1"
targetNamespace="http://frascati.ow2.org/counter">
<component name="server">
......
......@@ -26,7 +26,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://helloworld"
xmlns:hw="http://helloworld"
xmlns:frascati="http://frascati.ow2.org/plugin"
xmlns:frascati="http://frascati.ow2.org/xmlns/sca/1.1"
name="ClientRMI">
<service name="r" promote="client/r">
......
......@@ -26,7 +26,7 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
targetNamespace="http://helloworld"
xmlns:hw="http://helloworld"
xmlns:frascati="http://frascati.ow2.org/plugin"
xmlns:frascati="http://frascati.ow2.org/xmlns/sca/1.1"
name="ServerRMI">
<component name="server">
......
......@@ -24,7 +24,7 @@
<composite name="twitter-client"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:frascati="http://frascati.ow2.org/plugin"
xmlns:frascati="http://frascati.ow2.org/xmlns/sca/1.1"
targetNamespace="http://frascati.ow2.org/twitter">
<service name="r" promote="client/Runnable"/>
......
......@@ -26,7 +26,7 @@
<composite name="twitter-weather"
xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
xmlns:frascati="http://frascati.ow2.org/plugin"
xmlns:frascati="http://frascati.ow2.org/xmlns/sca/1.1"
targetNamespace="http://frascati.ow2.org/weather">
<service name="tw" promote="orchestration/TwitterWeather">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment