diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0bb7a0dcb75762864392a37bbdd4d2dea37edc1b..792f0c179ef41ded8773ece160b5456e6f7bbbe2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,6 @@ pages-master:
script:
- rm -rf "$RELEASE_DIR"
- mkdir -p "$RELEASE_DIR"
- - cp -r de.hft-stuttgart.indriya.p2site/target/repository/* "$RELEASE_DIR"
+ - cp -r de.hft-stuttgart.cityunits.p2site/target/repository/* "$RELEASE_DIR"
only:
- master
diff --git a/.project b/.project
index 9dd72dd39bb7adb15eeb3c14677c7e8c6f4cc2e2..437b91d61566c2b21155fc2ff9d8de096e4be934 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.parent</name>
+ <name>de.hftstuttgart.cityunits.parent</name>
<comment></comment>
<projects>
</projects>
diff --git a/README.md b/README.md
index 0d2ae8b00a6a5fbb08de96f16c28f2f8bcc68ea6..0fa268fac3917a42aaa6a71a0a204f9b27aea025 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# de.hft-stuttgart.cityunits
+# de.hftstuttgart.cityunits
Create Eclipse P2 repository with Ecore data types for units based on Indriya reference implementation and some special units for urban simulation.
-To add OSGi bundles published in this P2 repository add site [https://transfer.hft-stuttgart.de/pages/de.hft-stuttgart.cityunits/release_target_100/]() to a running Eclipse instance via `Eclipse -> Preferences -> Install/Update -> Available Software Sites -> Add...` or to a target platform definition via `Eclipse -> Preferences -> Plug-in Development -> Target Platform -> Edit...`.
\ No newline at end of file
+To add OSGi bundles published in this P2 repository add site [https://transfer.hft-stuttgart.de/pages/de.hftstuttgart.cityunits/release_target_100/]() to a running Eclipse instance via `Eclipse -> Preferences -> Install/Update -> Available Software Sites -> Add...` or to a target platform definition via `Eclipse -> Preferences -> Plug-in Development -> Target Platform -> Edit...`.
\ No newline at end of file
diff --git a/de.hft-stuttgart.cityunits.feature/.project b/de.hftstuttgart.cityunits.feature/.project
similarity index 91%
rename from de.hft-stuttgart.cityunits.feature/.project
rename to de.hftstuttgart.cityunits.feature/.project
index 1b6e2eab5586623fb8c2aaaa749a3ac8f31a567b..2c218c3ac9bc46ed8a9ebdab9560dbc1eb645a3b 100644
--- a/de.hft-stuttgart.cityunits.feature/.project
+++ b/de.hftstuttgart.cityunits.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.feature</name>
+ <name>de.hftstuttgart.cityunits.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/de.hft-stuttgart.cityunits.feature/build.properties b/de.hftstuttgart.cityunits.feature/build.properties
similarity index 100%
rename from de.hft-stuttgart.cityunits.feature/build.properties
rename to de.hftstuttgart.cityunits.feature/build.properties
diff --git a/de.hft-stuttgart.cityunits.feature/feature.xml b/de.hftstuttgart.cityunits.feature/feature.xml
similarity index 95%
rename from de.hft-stuttgart.cityunits.feature/feature.xml
rename to de.hftstuttgart.cityunits.feature/feature.xml
index fd427b2f2616d6a8b8b0a6f44d3e83c3400be457..d4f4c52aece7e83549c0c51276c12ce74c7f7d05 100644
--- a/de.hft-stuttgart.cityunits.feature/feature.xml
+++ b/de.hftstuttgart.cityunits.feature/feature.xml
@@ -43,14 +43,14 @@ Certain units relevant to City simulations are also added.
</requires>
<plugin
- id="de.hft-stuttgart.cityunits.model"
+ id="de.hftstuttgart.cityunits.model"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="de.hft-stuttgart.cityunits.ui.renderer"
+ id="de.hftstuttgart.cityunits.ui.renderer"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/de.hft-stuttgart.cityunits.feature/pom.xml b/de.hftstuttgart.cityunits.feature/pom.xml
similarity index 80%
rename from de.hft-stuttgart.cityunits.feature/pom.xml
rename to de.hftstuttgart.cityunits.feature/pom.xml
index ad0c2ae1e315d9640396605dc434a2993a00bf1b..d435cdd6a7deb6f631b1bcdd371987e3a84fb1d4 100644
--- a/de.hft-stuttgart.cityunits.feature/pom.xml
+++ b/de.hftstuttgart.cityunits.feature/pom.xml
@@ -7,8 +7,8 @@
<name>City Units Feature</name>
<parent>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
</parent>
diff --git a/de.hft-stuttgart.cityunits.model/.classpath b/de.hftstuttgart.cityunits.model/.classpath
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/.classpath
rename to de.hftstuttgart.cityunits.model/.classpath
diff --git a/de.hft-stuttgart.cityunits.model/.project b/de.hftstuttgart.cityunits.model/.project
similarity index 94%
rename from de.hft-stuttgart.cityunits.model/.project
rename to de.hftstuttgart.cityunits.model/.project
index 6a9fbf86a4a6921fd3b0599d85229a793e3b66f0..9e8aa94ca04f102b266df65e76ab96ded20049b4 100644
--- a/de.hft-stuttgart.cityunits.model/.project
+++ b/de.hftstuttgart.cityunits.model/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.model</name>
+ <name>de.hftstuttgart.cityunits.model</name>
<comment></comment>
<projects>
</projects>
diff --git a/de.hft-stuttgart.cityunits.model/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF
similarity index 84%
rename from de.hft-stuttgart.cityunits.model/META-INF/MANIFEST.MF
rename to de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF
index 405560fb05ef39f6d6795762b4bba2455bf116f1..b465a24012a1af71cb19c48407a6e71f1af75530 100644
--- a/de.hft-stuttgart.cityunits.model/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.cityunits.model/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-SymbolicName: de.hft-stuttgart.cityunits.model;singleton:=true
+Bundle-SymbolicName: de.hftstuttgart.cityunits.model;singleton:=true
Bundle-Version: 1.0.0
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Automatic-Module-Name: de.hft-stuttgart.cityunits.model
+Automatic-Module-Name: de.hftstuttgart.cityunits.model
Require-Bundle: tech.units.indriya;bundle-version="[2.1.1,3.0.0)",
javax.measure.unit-api;bundle-version="[2.1.1,3.0.0)",
org.eclipse.core.runtime,
diff --git a/de.hft-stuttgart.cityunits.model/build.properties b/de.hftstuttgart.cityunits.model/build.properties
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/build.properties
rename to de.hftstuttgart.cityunits.model/build.properties
diff --git a/de.hft-stuttgart.cityunits.model/model/Quantities.ecore b/de.hftstuttgart.cityunits.model/model/Quantities.ecore
similarity index 90%
rename from de.hft-stuttgart.cityunits.model/model/Quantities.ecore
rename to de.hftstuttgart.cityunits.model/model/Quantities.ecore
index a26cc483f4163b9256639b80e7e71dacfd2c18cf..343c37f7b8a2ea7dc00fca96c7c7b557caf64fcd 100644
--- a/de.hft-stuttgart.cityunits.model/model/Quantities.ecore
+++ b/de.hftstuttgart.cityunits.model/model/Quantities.ecore
@@ -1,6 +1,6 @@
<?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="quantities" nsURI="https://www.hft-stuttgart.de/quantities"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="quantities" nsURI="https://www.hftstuttgart.de/quantities"
nsPrefix="quant">
<eClassifiers xsi:type="ecore:EDataType" name="QuantityDouble" instanceClassName="de.hftstuttgart.cityunits.model.NullableQuantity"/>
<eClassifiers xsi:type="ecore:EDataType" name="QuantityLong" instanceClassName="de.hftstuttgart.cityunits.model.NullableQuantity"/>
diff --git a/de.hft-stuttgart.cityunits.model/model/Quantities.genmodel b/de.hftstuttgart.cityunits.model/model/Quantities.genmodel
similarity index 88%
rename from de.hft-stuttgart.cityunits.model/model/Quantities.genmodel
rename to de.hftstuttgart.cityunits.model/model/Quantities.genmodel
index 28dff2065643434c6a5c76f622ffff2fc9a27936..bb62e8fdeacbab3f8f450dc6eed578d43ae60f86 100644
--- a/de.hft-stuttgart.cityunits.model/model/Quantities.genmodel
+++ b/de.hftstuttgart.cityunits.model/model/Quantities.genmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
- modelDirectory="/de.hft-stuttgart.cityunits.model/src" modelPluginID="de.hft-stuttgart.cityunits.model"
+ modelDirectory="/de.hftstuttgart.cityunits.model/src" modelPluginID="de.hftstuttgart.cityunits.model"
modelName="Quantities" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="15.0" copyrightFields="false"
operationReflection="true" importOrganizing="true">
diff --git a/de.hft-stuttgart.cityunits.model/plugin.properties b/de.hftstuttgart.cityunits.model/plugin.properties
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/plugin.properties
rename to de.hftstuttgart.cityunits.model/plugin.properties
diff --git a/de.hft-stuttgart.cityunits.model/plugin.xml b/de.hftstuttgart.cityunits.model/plugin.xml
similarity index 86%
rename from de.hft-stuttgart.cityunits.model/plugin.xml
rename to de.hftstuttgart.cityunits.model/plugin.xml
index 0e085691f62bf03b675cc4220d4f9f734ca27da5..1d5a5d6cd82b1b0f6f6621371f652bb5ca9bc5ff 100644
--- a/de.hft-stuttgart.cityunits.model/plugin.xml
+++ b/de.hftstuttgart.cityunits.model/plugin.xml
@@ -9,7 +9,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<!-- @generated Quantities -->
<package
- uri="https://www.hft-stuttgart.de/quantities"
+ uri="https://www.hftstuttgart.de/quantities"
class="de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage"
genModel="model/Quantities.genmodel"/>
</extension>
diff --git a/de.hft-stuttgart.cityunits.model/pom.xml b/de.hftstuttgart.cityunits.model/pom.xml
similarity index 68%
rename from de.hft-stuttgart.cityunits.model/pom.xml
rename to de.hftstuttgart.cityunits.model/pom.xml
index 2b0adeea26f23efbdd9b87540818c98dec106c5c..70678b5cb55312d26f377bccbd0a2bac79d3ce32 100644
--- a/de.hft-stuttgart.cityunits.model/pom.xml
+++ b/de.hftstuttgart.cityunits.model/pom.xml
@@ -2,13 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>de.hft-stuttgart.cityunits.model</artifactId>
+ <artifactId>de.hftstuttgart.cityunits.model</artifactId>
<packaging>eclipse-plugin</packaging>
<name>City Units</name>
<parent>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
</parent>
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Dollar.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Dollar.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Dollar.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Dollar.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Euro.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Euro.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Euro.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Euro.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Intensity.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Intensity.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Intensity.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/Intensity.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/NullableQuantity.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/NullableQuantity.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/NullableQuantity.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/NullableQuantity.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/UrbanSimulationUnits.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/VolumetricFlowRate.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/VolumetricFlowRate.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/VolumetricFlowRate.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/VolumetricFlowRate.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesFactory.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesFactory.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesFactory.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesFactory.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
similarity index 98%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
index 441bc70e093d5f7c67dc299189f6cbc37f5def42..0ff58da50ae7eafe706bcd035b6b0e2cf623c9c4 100644
--- a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
+++ b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/QuantitiesPackage.java
@@ -36,7 +36,7 @@ public interface QuantitiesPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "https://www.hft-stuttgart.de/quantities";
+ String eNS_URI = "https://www.hftstuttgart.de/quantities";
/**
* The package namespace name.
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesFactoryImpl.java
diff --git a/de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java b/de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java
rename to de.hftstuttgart.cityunits.model/src/de/hftstuttgart/cityunits/model/quantities/impl/QuantitiesPackageImpl.java
diff --git a/de.hft-stuttgart.cityunits.p2site/.project b/de.hftstuttgart.cityunits.p2site/.project
similarity index 91%
rename from de.hft-stuttgart.cityunits.p2site/.project
rename to de.hftstuttgart.cityunits.p2site/.project
index d15d10ad037ea684ea6f050ca38b037ccb073a53..c1c7c20383958a8aef10a3d31a964dac79a31eb6 100644
--- a/de.hft-stuttgart.cityunits.p2site/.project
+++ b/de.hftstuttgart.cityunits.p2site/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.p2site</name>
+ <name>de.hftstuttgart.cityunits.p2site</name>
<comment></comment>
<projects>
</projects>
diff --git a/de.hft-stuttgart.cityunits.p2site/category.xml b/de.hftstuttgart.cityunits.p2site/category.xml
similarity index 59%
rename from de.hft-stuttgart.cityunits.p2site/category.xml
rename to de.hftstuttgart.cityunits.p2site/category.xml
index 8915acc9220b4585c639a8ee9225a19efc2875dc..c66b4a7e24de71cb0aff9fa44f0dae3e65f8d43d 100644
--- a/de.hft-stuttgart.cityunits.p2site/category.xml
+++ b/de.hftstuttgart.cityunits.p2site/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="de.hft-stuttgart.cityunits.feature">
- <category name="de.hft-stuttgart.cityunits"/>
+ <feature id="de.hftstuttgart.cityunits.feature">
+ <category name="de.hftstuttgart.cityunits"/>
</feature>
- <category-def name="de.hft-stuttgart.cityunits" label="HfT Stuttgart City Units">
+ <category-def name="de.hftstuttgart.cityunits" label="HfT Stuttgart City Units">
<description>
Introduce Ecore types for modeling quantities with units of mesurement (JSR-385). Add also units especially useful for urban simulation.
</description>
diff --git a/de.hft-stuttgart.cityunits.p2site/pom.xml b/de.hftstuttgart.cityunits.p2site/pom.xml
similarity index 69%
rename from de.hft-stuttgart.cityunits.p2site/pom.xml
rename to de.hftstuttgart.cityunits.p2site/pom.xml
index 24da65c7a970467e1b23c0a93189f88213533430..d25a7ea0cf52d1a75035d472df0542c26d52e89c 100644
--- a/de.hft-stuttgart.cityunits.p2site/pom.xml
+++ b/de.hftstuttgart.cityunits.p2site/pom.xml
@@ -1,11 +1,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>de.hft-stuttgart.cityunits.p2site</artifactId>
+ <artifactId>de.hftstuttgart.cityunits.p2site</artifactId>
<packaging>eclipse-repository</packaging>
<name>City Units P2 Site Generation</name>
<parent>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
</parent>
</project>
\ No newline at end of file
diff --git a/de.hft-stuttgart.cityunits.p2site/site.xml b/de.hftstuttgart.cityunits.p2site/site.xml
similarity index 50%
rename from de.hft-stuttgart.cityunits.p2site/site.xml
rename to de.hftstuttgart.cityunits.p2site/site.xml
index 2bcbbd2471189d6bb6c26c4831108d856bd18c40..031891b0213eb0876620cdede0b6715a4583dd5a 100644
--- a/de.hft-stuttgart.cityunits.p2site/site.xml
+++ b/de.hftstuttgart.cityunits.p2site/site.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/de.hft-stuttgart.cityunits.feature_1.0.0.jar" id="de.hft-stuttgart.cityunits.feature" version="1.0.0">
- <category name="de.hft-stuttgart.cityunits"/>
+ <feature url="features/de.hftstuttgart.cityunits.feature_1.0.0.jar" id="de.hftstuttgart.cityunits.feature" version="1.0.0">
+ <category name="de.hftstuttgart.cityunits"/>
</feature>
- <category-def name="de.hft-stuttgart.cityunits" label="HfT Stuttgart City Units">
+ <category-def name="de.hftstuttgart.cityunits" label="HfT Stuttgart City Units">
<description>
Introduce Ecore types for modeling quantities with units of mesurement (JSR-385). Add also units especially useful for urban simulation.
</description>
diff --git a/de.hft-stuttgart.cityunits.target/.project b/de.hftstuttgart.cityunits.target/.project
similarity index 87%
rename from de.hft-stuttgart.cityunits.target/.project
rename to de.hftstuttgart.cityunits.target/.project
index a443490d005c4961e34e484573782e6ac8bd3ddb..7b604858bdd9dfc630803f83d2ef7cc25cd7a08d 100644
--- a/de.hft-stuttgart.cityunits.target/.project
+++ b/de.hftstuttgart.cityunits.target/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.target</name>
+ <name>de.hftstuttgart.cityunits.target</name>
<comment></comment>
<projects>
</projects>
diff --git "a/de.hft-stuttgart.cityunits.target/Icon\r" "b/de.hftstuttgart.cityunits.target/Icon\r"
similarity index 100%
rename from "de.hft-stuttgart.cityunits.target/Icon\r"
rename to "de.hftstuttgart.cityunits.target/Icon\r"
diff --git a/de.hft-stuttgart.cityunits.target/cityunits.target.target b/de.hftstuttgart.cityunits.target/cityunits.target.target
similarity index 100%
rename from de.hft-stuttgart.cityunits.target/cityunits.target.target
rename to de.hftstuttgart.cityunits.target/cityunits.target.target
diff --git a/de.hft-stuttgart.cityunits.target/pom.xml b/de.hftstuttgart.cityunits.target/pom.xml
similarity index 70%
rename from de.hft-stuttgart.cityunits.target/pom.xml
rename to de.hftstuttgart.cityunits.target/pom.xml
index 752c81513ea816d1a95c5e5d01ad9c5917f71c39..e27d2a3d2fceb5bf0dfe333a94abba8c37d4bc1b 100644
--- a/de.hft-stuttgart.cityunits.target/pom.xml
+++ b/de.hftstuttgart.cityunits.target/pom.xml
@@ -2,13 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>de.hft-stuttgart.cityunits.target</artifactId>
+ <artifactId>de.hftstuttgart.cityunits.target</artifactId>
<packaging>eclipse-target-definition</packaging>
<name>City Units Target Definition</name>
<parent>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
</parent>
diff --git a/de.hft-stuttgart.cityunits.tests/.classpath b/de.hftstuttgart.cityunits.tests/.classpath
similarity index 100%
rename from de.hft-stuttgart.cityunits.tests/.classpath
rename to de.hftstuttgart.cityunits.tests/.classpath
diff --git a/de.hft-stuttgart.cityunits.tests/.project b/de.hftstuttgart.cityunits.tests/.project
similarity index 94%
rename from de.hft-stuttgart.cityunits.tests/.project
rename to de.hftstuttgart.cityunits.tests/.project
index 333fd81041a26c87ba3f18b325d976bb630bad00..603e70f915fe236b42b9db5b57b0e018a098d0e3 100644
--- a/de.hft-stuttgart.cityunits.tests/.project
+++ b/de.hftstuttgart.cityunits.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.tests</name>
+ <name>de.hftstuttgart.cityunits.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/de.hft-stuttgart.cityunits.tests/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF
similarity index 87%
rename from de.hft-stuttgart.cityunits.tests/META-INF/MANIFEST.MF
rename to de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF
index 4845894c4486d77bb75c02f3a2acdca5e0988b74..d71cbdb4202d7bb7158fa9e93ffdf5799d8da354 100644
--- a/de.hft-stuttgart.cityunits.tests/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.cityunits.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tests
-Bundle-SymbolicName: de.hft-stuttgart.cityunits.tests
+Bundle-SymbolicName: de.hftstuttgart.cityunits.tests
Bundle-Version: 1.0.0
Automatic-Module-Name: de.hft.stuttgart.cityunits.tests
Import-Package: de.hftstuttgart.cityunits.model,
diff --git a/de.hft-stuttgart.cityunits.tests/build.properties b/de.hftstuttgart.cityunits.tests/build.properties
similarity index 100%
rename from de.hft-stuttgart.cityunits.tests/build.properties
rename to de.hftstuttgart.cityunits.tests/build.properties
diff --git a/de.hft-stuttgart.cityunits.tests/pom.xml b/de.hftstuttgart.cityunits.tests/pom.xml
similarity index 69%
rename from de.hft-stuttgart.cityunits.tests/pom.xml
rename to de.hftstuttgart.cityunits.tests/pom.xml
index 257aeea82aadb56390b1013394dfe4fe6610dc65..672223c1bf2cab443a5c53ec912c8c0e9f6b2d36 100644
--- a/de.hft-stuttgart.cityunits.tests/pom.xml
+++ b/de.hftstuttgart.cityunits.tests/pom.xml
@@ -2,13 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>de.hft-stuttgart.cityunits.tests</artifactId>
+ <artifactId>de.hftstuttgart.cityunits.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<name>City Units Tests</name>
<parent>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
</parent>
diff --git a/de.hft-stuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java b/de.hftstuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java
rename to de.hftstuttgart.cityunits.tests/src/de/hftstuttgart/cityunits/tests/QuantityTest.java
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/.classpath b/de.hftstuttgart.cityunits.ui.renderer/.classpath
similarity index 100%
rename from de.hft-stuttgart.cityunits.ui.renderer/.classpath
rename to de.hftstuttgart.cityunits.ui.renderer/.classpath
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/.project b/de.hftstuttgart.cityunits.ui.renderer/.project
similarity index 90%
rename from de.hft-stuttgart.cityunits.ui.renderer/.project
rename to de.hftstuttgart.cityunits.ui.renderer/.project
index b6499485709cf2f99807d690249f32c15b60e271..593ecce63fedd81d4e436bea9dd1f0c7b130e4a1 100644
--- a/de.hft-stuttgart.cityunits.ui.renderer/.project
+++ b/de.hftstuttgart.cityunits.ui.renderer/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>de.hft-stuttgart.cityunits.ui.renderer</name>
+ <name>de.hftstuttgart.cityunits.ui.renderer</name>
<comment></comment>
<projects>
</projects>
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF b/de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF
similarity index 85%
rename from de.hft-stuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF
rename to de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF
index cf2290214bc9059abbba754da1ad48b9b58e3506..0852854604d634f476d2b8c62c0ae135d488c421 100644
--- a/de.hft-stuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF
+++ b/de.hftstuttgart.cityunits.ui.renderer/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: QuantityControl
-Bundle-SymbolicName: de.hft-stuttgart.cityunits.ui.renderer;singleton:=true
+Bundle-SymbolicName: de.hftstuttgart.cityunits.ui.renderer;singleton:=true
Bundle-Version: 1.0.0
Bundle-Vendor: HfT Stuttgart
Export-Package: de.hftstuttgart.cityunits.ui.renderer;version="1.0.0"
-Require-Bundle: de.hft-stuttgart.cityunits.model;bundle-version="1.0.0",
+Require-Bundle: de.hftstuttgart.cityunits.model;bundle-version="1.0.0",
org.eclipse.emf.ecp.edit.swt;bundle-version="[1.24.0,2.0.0)",
org.eclipse.emf.ecp.ui.view.swt;bundle-version="[1.24.0,2.0.0)",
org.eclipse.emf.ecp.view.core.swt;bundle-version="[1.24.0,2.0.0)",
@@ -25,4 +25,4 @@ Import-Package: javax.inject;version="1.0.0",
org.eclipse.jface.layout;version="0.0.0",
org.eclipse.swt;version="0.0.0",
org.eclipse.swt.widgets;version="0.0.0"
-Automatic-Module-Name: de.hft-stuttgart.units.ui.eclipse.quantityrenderer
+Automatic-Module-Name: de.hftstuttgart.units.ui.eclipse.quantityrenderer
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/OSGI-INF/quantityRendererService.xml b/de.hftstuttgart.cityunits.ui.renderer/OSGI-INF/quantityRendererService.xml
similarity index 93%
rename from de.hft-stuttgart.cityunits.ui.renderer/OSGI-INF/quantityRendererService.xml
rename to de.hftstuttgart.cityunits.ui.renderer/OSGI-INF/quantityRendererService.xml
index f628d2129e06b63e8229803797a434a907a90d83..14c25c48f558b7d3bb7cf17c7a42914ede395f73 100644
--- a/de.hft-stuttgart.cityunits.ui.renderer/OSGI-INF/quantityRendererService.xml
+++ b/de.hftstuttgart.cityunits.ui.renderer/OSGI-INF/quantityRendererService.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="de.hft-stuttgart.units.ui.rendererservice">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="de.hftstuttgart.units.ui.rendererservice">
<implementation class="de.hftstuttgart.cityunits.ui.renderer.QuantityControlRendererService"/>
<service>
<provide interface="org.eclipse.emfforms.spi.swt.core.di.EMFFormsDIRendererService"/>
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/build.properties b/de.hftstuttgart.cityunits.ui.renderer/build.properties
similarity index 100%
rename from de.hft-stuttgart.cityunits.ui.renderer/build.properties
rename to de.hftstuttgart.cityunits.ui.renderer/build.properties
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/pom.xml b/de.hftstuttgart.cityunits.ui.renderer/pom.xml
similarity index 68%
rename from de.hft-stuttgart.cityunits.ui.renderer/pom.xml
rename to de.hftstuttgart.cityunits.ui.renderer/pom.xml
index 9b0a1a310f2a21608a98d3be86eb4da4440316be..3ad8bc49e4694d9be76793af3847c7601534a358 100644
--- a/de.hft-stuttgart.cityunits.ui.renderer/pom.xml
+++ b/de.hftstuttgart.cityunits.ui.renderer/pom.xml
@@ -2,13 +2,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>de.hft-stuttgart.cityunits.ui.renderer</artifactId>
+ <artifactId>de.hftstuttgart.cityunits.ui.renderer</artifactId>
<packaging>eclipse-plugin</packaging>
<name>City Units SWT Renderer</name>
<parent>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
</parent>
</project>
\ No newline at end of file
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRenderer.java b/de.hftstuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRenderer.java
similarity index 99%
rename from de.hft-stuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRenderer.java
rename to de.hftstuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRenderer.java
index 23797c0188aa0791b0813ce744930781c0ffb292..e9150584f6ca4c8d9fa3b1d5e09a2c1c926bc510 100644
--- a/de.hft-stuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRenderer.java
+++ b/de.hftstuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRenderer.java
@@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Text;
import de.hftstuttgart.cityunits.model.NullableQuantity;
import de.hftstuttgart.cityunits.model.quantities.QuantitiesPackage;
-// import de.hft-stuttgart.energycomponents.EnCompPackage;
+// import de.hftstuttgart.energycomponents.EnCompPackage;
public class QuantityControlRenderer extends TextControlSWTRenderer {
diff --git a/de.hft-stuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRendererService.java b/de.hftstuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRendererService.java
similarity index 100%
rename from de.hft-stuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRendererService.java
rename to de.hftstuttgart.cityunits.ui.renderer/src/de/hftstuttgart/cityunits/ui/renderer/QuantityControlRendererService.java
diff --git a/pom.xml b/pom.xml
index af2da349510948ab7a97e0efcd2e2a938770b775..d0e04fb5981342a56bf052421e50c63379e8f7b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
<name>City Units Parent POM</name>
@@ -34,8 +34,8 @@
<pomDependencies>consider</pomDependencies>
<target>
<artifact>
- <groupId>de.hft-stuttgart</groupId>
- <artifactId>de.hft-stuttgart.cityunits.target</artifactId>
+ <groupId>de.hftstuttgart</groupId>
+ <artifactId>de.hftstuttgart.cityunits.target</artifactId>
<version>1.0.0</version>
</artifact>
</target>
@@ -86,12 +86,12 @@
</dependencies>
<modules>
- <module>de.hft-stuttgart.cityunits.target</module>
- <module>de.hft-stuttgart.cityunits.feature</module>
- <module>de.hft-stuttgart.cityunits.model</module>
- <module>de.hft-stuttgart.cityunits.ui.renderer</module>
- <module>de.hft-stuttgart.cityunits.p2site</module>
- <module>de.hft-stuttgart.cityunits.tests</module>
+ <module>de.hftstuttgart.cityunits.target</module>
+ <module>de.hftstuttgart.cityunits.feature</module>
+ <module>de.hftstuttgart.cityunits.model</module>
+ <module>de.hftstuttgart.cityunits.ui.renderer</module>
+ <module>de.hftstuttgart.cityunits.p2site</module>
+ <module>de.hftstuttgart.cityunits.tests</module>
</modules>
</project>
\ No newline at end of file