Skip to content

Commit 09f2298

Browse files
perezpperezp
authored
Merge pull request #22 from MicheleGuerriero/fix/more-fixes-to-ddsm
Fix/more fixes to ddsm
2 parents ad40b74 + 8ff9069 commit 09f2298

File tree

57 files changed

+6330
-992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+6330
-992
lines changed

‎bundles/com.masdes.dam.static.profile.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: com.masdes.dam.static.profile.ui;singleton:=true
5-
Bundle-Version: 0.12.0.qualifier
5+
Bundle-Version: 0.12.1.qualifier
66
Bundle-ClassPath: .
77
Bundle-Activator: com.masdes.dam.profile.ui.DAMEditPlugin$Implementation
88
Bundle-Vendor: %providerName

‎bundles/com.masdes.dam.static.profile/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: com.masdes.dam.static.profile;singleton:=true
5-
Bundle-Version: 0.12.0.qualifier
5+
Bundle-Version: 0.12.1.qualifier
66
Bundle-ClassPath: .
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

‎bundles/es.unizar.disco.dice.static.profile/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: es.unizar.disco.dice.static.profile;singleton:=true
5-
Bundle-Version: 0.12.0.qualifier
5+
Bundle-Version: 0.12.1.qualifier
66
Bundle-ClassPath: .
77
Bundle-Vendor: %providerName
88
Bundle-Localization: plugin

‎bundles/es.unizar.disco.dice.static.profile/resources/DICE.ecore‎

Lines changed: 93 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,14 @@
354354
<eStructuralFeatures xsi:type="ecore:EAttribute" name="launch_script" ordered="false"
355355
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
356356
<eStructuralFeatures xsi:type="ecore:EAttribute" name="language" ordered="false"
357-
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
357+
eType="ecore:EEnum DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/LanguageType"
358+
defaultValueLiteral="bash"/>
359+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enable_monitoring"
360+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
361+
defaultValueLiteral="false"/>
362+
<eStructuralFeatures xsi:type="ecore:EReference" name="firewallRules" ordered="false"
363+
upperBound="-1" eType="ecore:EClass DICE_Library.ecore#//Basic_DICE_Types/Basic_Data_Types/FirewallRule"
364+
containment="true"/>
358365
</eClassifiers>
359366
<eClassifiers xsi:type="ecore:EClass" name="DdsmHeterogeneousCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmExternalComponent">
360367
<eStructuralFeatures xsi:type="ecore:EReference" name="hasVM" ordered="false"
@@ -382,8 +389,6 @@
382389
defaultValueLiteral="0"/>
383390
<eStructuralFeatures xsi:type="ecore:EAttribute" name="os" ordered="false"
384391
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
385-
<eStructuralFeatures xsi:type="ecore:EAttribute" name="securityGroup" ordered="false"
386-
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
387392
<eStructuralFeatures xsi:type="ecore:EAttribute" name="privateKey" ordered="false"
388393
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
389394
<eStructuralFeatures xsi:type="ecore:EAttribute" name="sshKey" ordered="false"
@@ -400,6 +405,27 @@
400405
<eClassifiers xsi:type="ecore:EClass" name="DdsmYarnCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmMasterSlavePlatform">
401406
<eStructuralFeatures xsi:type="ecore:EReference" name="base_ExecutionEnvironment"
402407
ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ExecutionEnvironment"/>
408+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enable_acl" ordered="false"
409+
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
410+
defaultValueLiteral="false"/>
411+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduler_type" ordered="false"
412+
eType="ecore:EEnum DICE_Library.ecore#//Basic_DICE_Types/Basic_Enumeration_Types/Scheduling"
413+
defaultValueLiteral="capacity"/>
414+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduler_min_container_mem_mb"
415+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
416+
defaultValueLiteral="0"/>
417+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduler_max_container_mem_mb"
418+
ordered="false" lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
419+
defaultValueLiteral="0"/>
420+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduler_min_container_core_num"
421+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
422+
defaultValueLiteral="0"/>
423+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="scheduler_max_container_core_num"
424+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
425+
defaultValueLiteral="0"/>
426+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="nodemanager_available_mem"
427+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
428+
defaultValueLiteral="0"/>
403429
</eClassifiers>
404430
<eClassifiers xsi:type="ecore:EClass" name="DdsmMasterSlavePlatform" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmInternalComponent">
405431
<eStructuralFeatures xsi:type="ecore:EReference" name="masterHost" ordered="false"
@@ -420,6 +446,39 @@
420446
<eClassifiers xsi:type="ecore:EClass" name="DdsmKafkaCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmPeerToPeerPlatform">
421447
<eStructuralFeatures xsi:type="ecore:EReference" name="base_ExecutionEnvironment"
422448
ordered="false" lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//ExecutionEnvironment"/>
449+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enable_topic_deletion"
450+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
451+
defaultValueLiteral="false"/>
452+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="num_network_threads"
453+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
454+
defaultValueLiteral="0"/>
455+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="num_io_threads" ordered="false"
456+
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
457+
defaultValueLiteral="0"/>
458+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="num_log_partition_per_topic"
459+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
460+
defaultValueLiteral="0"/>
461+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="num_recovery_threads_per_data_dir"
462+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
463+
defaultValueLiteral="0"/>
464+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="num_messages_for_flush_to_disk"
465+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
466+
defaultValueLiteral="0"/>
467+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="max_message_sit_time_before_flush_ms"
468+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
469+
defaultValueLiteral="0"/>
470+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enable_topic_auto_creation"
471+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
472+
defaultValueLiteral="true"/>
473+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="enable_leader_rebalancing"
474+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
475+
defaultValueLiteral="true"/>
476+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="log_retention_hours"
477+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
478+
defaultValueLiteral="0"/>
479+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="queued_max_requests"
480+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
481+
defaultValueLiteral="0"/>
423482
</eClassifiers>
424483
<eClassifiers xsi:type="ecore:EClass" name="DdsmStormCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmMasterSlavePlatform">
425484
<eStructuralFeatures xsi:type="ecore:EAttribute" name="taskTimeout" ordered="false"
@@ -469,13 +528,41 @@
469528
<eStructuralFeatures xsi:type="ecore:EAttribute" name="application_name" ordered="false"
470529
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
471530
<eStructuralFeatures xsi:type="ecore:EAttribute" name="arguments" ordered="false"
472-
lowerBound="1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
531+
upperBound="-1" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//String"/>
473532
</eClassifiers>
474533
<eClassifiers xsi:type="ecore:EClass" name="DdsmJobDeployedFrom">
475534
<eStructuralFeatures xsi:type="ecore:EReference" name="base_Dependency" ordered="false"
476535
lowerBound="1" eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Dependency"/>
477536
</eClassifiers>
478-
<eClassifiers xsi:type="ecore:EClass" name="DdsmHdfsCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmMasterSlavePlatform"/>
537+
<eClassifiers xsi:type="ecore:EClass" name="DdsmHdfsCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmMasterSlavePlatform">
538+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="dfs_blocksize" ordered="false"
539+
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
540+
defaultValueLiteral="134217728"/>
541+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="namenode_handler_count"
542+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
543+
defaultValueLiteral="0"/>
544+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="datanode_handler_count"
545+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
546+
defaultValueLiteral="0"/>
547+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="namenode_heartbeat_recheck_interval_ms"
548+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
549+
defaultValueLiteral="0"/>
550+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="permission_enabled"
551+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
552+
defaultValueLiteral="false"/>
553+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="block_replication"
554+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
555+
defaultValueLiteral="0"/>
556+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="blocksize_bytes" ordered="false"
557+
eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
558+
defaultValueLiteral="0"/>
559+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="block_write_retries"
560+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"
561+
defaultValueLiteral="0"/>
562+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resource_manager_recovery_enabled"
563+
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Boolean"
564+
defaultValueLiteral="false"/>
565+
</eClassifiers>
479566
<eClassifiers xsi:type="ecore:EClass" name="DdsmCassandraCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmPeerToPeerPlatform">
480567
<eStructuralFeatures xsi:type="ecore:EReference" name="seedHost" ordered="false"
481568
eType="#//DICE_UML_Extensions/DDSM/DdsmVMsCluster"/>
@@ -494,6 +581,7 @@
494581
<eStructuralFeatures xsi:type="ecore:EAttribute" name="permission_validity_in_ms"
495582
ordered="false" eType="ecore:EDataType ../../org.eclipse.uml2.types/model/Types.ecore#//Integer"/>
496583
</eClassifiers>
584+
<eClassifiers xsi:type="ecore:EClass" name="DdsmSparkCluster" eSuperTypes="#//DICE_UML_Extensions/DDSM/DdsmMasterSlavePlatform"/>
497585
</eSubpackages>
498586
</eSubpackages>
499587
</ecore:EPackage>

0 commit comments

Comments
 (0)