561700 - Repo restruct: Merge api.base and api.default projects - Move default into base
Change-Id: I75929ba8f75e3b2b926cfdd6354dc062d0233a18
Signed-off-by: Simon Skoczylas <simon.skoczylas@karakun.com>
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContext.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContext.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContext.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContext.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContextFactory.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContextFactory.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContextFactory.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/ApplicationContextFactory.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/EntityManager.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/EntityManager.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/EntityManager.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/EntityManager.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogAttribute.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogAttribute.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogAttribute.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogAttribute.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogComponent.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogComponent.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogComponent.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogComponent.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogSensor.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogSensor.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogSensor.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/CatalogSensor.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Classification.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Classification.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Classification.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Classification.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Domain.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Domain.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Domain.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Domain.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/EntityFactory.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/EntityFactory.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/EntityFactory.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/EntityFactory.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystem.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystem.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystem.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystem.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystemAttribute.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystemAttribute.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystemAttribute.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ExtSystemAttribute.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/MDMAttribute.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/MDMAttribute.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/MDMAttribute.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/MDMAttribute.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Pool.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Pool.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Pool.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Pool.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Project.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Project.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Project.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Project.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ProjectDomain.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ProjectDomain.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ProjectDomain.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ProjectDomain.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Role.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Role.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Role.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Role.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Status.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Status.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Status.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Status.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/SystemParameter.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/SystemParameter.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/SystemParameter.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/SystemParameter.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateAttribute.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateAttribute.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateAttribute.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateAttribute.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateComponent.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateComponent.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateComponent.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateComponent.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateRoot.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateRoot.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateRoot.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateRoot.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateSensor.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateSensor.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateSensor.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateSensor.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTest.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTest.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTest.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTest.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStep.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStep.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStep.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStep.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStepUsage.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStepUsage.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStepUsage.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/TemplateTestStepUsage.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/UserParameter.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/UserParameter.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/UserParameter.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/UserParameter.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ValueList.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ValueList.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ValueList.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ValueList.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ValueListValue.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ValueListValue.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/ValueListValue.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/ValueListValue.java
diff --git a/org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Versionable.java b/org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Versionable.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/main/java/org/eclipse/mdm/api/dflt/model/Versionable.java
rename to org.eclipse.mdm.api.base/src/main/java/org/eclipse/mdm/api/dflt/model/Versionable.java
diff --git a/org.eclipse.mdm.api.default/src/test/java/org/eclipse/mdm/api/dflt/model/EntityFactoryTest.java b/org.eclipse.mdm.api.base/src/test/java/org/eclipse/mdm/api/dflt/model/EntityFactoryTest.java
similarity index 100%
rename from org.eclipse.mdm.api.default/src/test/java/org/eclipse/mdm/api/dflt/model/EntityFactoryTest.java
rename to org.eclipse.mdm.api.base/src/test/java/org/eclipse/mdm/api/dflt/model/EntityFactoryTest.java
diff --git a/org.eclipse.mdm.api.default/.gitignore b/org.eclipse.mdm.api.default/.gitignore
deleted file mode 100644
index 49678ad..0000000
--- a/org.eclipse.mdm.api.default/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-# eclipse
-.classpath
-.project
-.settings/
-bin/
-
-# gradle
-.gradle
-build/
-
-# intellij
-.idea/
-out/
-*.ipr
-*.iml
-*.iws
-/bin/
diff --git a/org.eclipse.mdm.api.default/build.gradle b/org.eclipse.mdm.api.default/build.gradle
deleted file mode 100644
index b574fa4..0000000
--- a/org.eclipse.mdm.api.default/build.gradle
+++ /dev/null
@@ -1,47 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-description = 'MDM API - Default Model'
-
-apply plugin: 'java'
-apply plugin: 'maven'
-apply plugin: 'eclipse'
-
-repositories {
- mavenLocal()
- mavenCentral()
-}
-
-dependencies {
- compile project(":org.eclipse.mdm.api.base")
-
- // testing
- testCompile 'junit:junit:4.12'
- testCompile 'org.mockito:mockito-core:2.13.0'
- testCompile 'org.assertj:assertj-core:3.6.2'
-}
-
-jar {
- metaInf { from '../NOTICE.txt' }
- metaInf { from '../LICENSE.txt' }
-}
-
-task sourcesJar(type: Jar, dependsOn: classes) {
- classifier = 'sources'
- from sourceSets.main.allSource
-}
-
-artifacts {
- archives sourcesJar
-}
\ No newline at end of file
diff --git a/org.eclipse.mdm.api.default/gradle.properties b/org.eclipse.mdm.api.default/gradle.properties
deleted file mode 100644
index 2ab5436..0000000
--- a/org.eclipse.mdm.api.default/gradle.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-sourceCompatibility=1.8
-targetCompatibility=1.8
\ No newline at end of file
diff --git a/org.eclipse.mdm.api.default/settings.gradle b/org.eclipse.mdm.api.default/settings.gradle
deleted file mode 100644
index c7402a5..0000000
--- a/org.eclipse.mdm.api.default/settings.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2015-2018 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- ********************************************************************************/
-
-rootProject.name = 'org.eclipse.mdm.api.default'
diff --git a/org.eclipse.mdm.api.odsadapter/build.gradle b/org.eclipse.mdm.api.odsadapter/build.gradle
index 4c7ccdc..abe8518 100644
--- a/org.eclipse.mdm.api.odsadapter/build.gradle
+++ b/org.eclipse.mdm.api.odsadapter/build.gradle
@@ -76,7 +76,6 @@
// MDM5 API
compile project(":org.eclipse.mdm.api.base")
- compile project(":org.eclipse.mdm.api.default")
// compile CORBA idl using JDK tools
generatedCompile files(System.getenv('JAVA_HOME') + '/lib/tools.jar')
diff --git a/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/build.gradle
index b2de09f..2cb7768 100644
--- a/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/build.gradle
+++ b/org.eclipse.mdm.nucleus/org.eclipse.mdm.connector/build.gradle
@@ -16,7 +16,7 @@
description = 'MDM Connector'
dependencies {
- compile project(":org.eclipse.mdm.api.default");
+ compile project(":org.eclipse.mdm.api.base");
compile project(':org.eclipse.mdm.nucleus:org.eclipse.mdm.property')
compile group: 'com.google.guava', name: 'guava', version: "25.0-jre"
diff --git a/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/build.gradle b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/build.gradle
index 6f03f7f..b18d8ac 100644
--- a/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/build.gradle
+++ b/org.eclipse.mdm.nucleus/org.eclipse.mdm.freetextindexer/build.gradle
@@ -30,7 +30,7 @@
compileOnly 'com.fasterxml.jackson.core:jackson-databind:2.5.1'
- compile project(":org.eclipse.mdm.api.default")
+ compile project(":org.eclipse.mdm.api.base")
compile project(':org.eclipse.mdm.nucleus:org.eclipse.mdm.connector')
compile project(':org.eclipse.mdm.nucleus:org.eclipse.mdm.property')
diff --git a/settings.gradle b/settings.gradle
index 4274c5d..6081d5b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,7 +16,6 @@
rootProject.name = 'org.eclipse.mdm'
include 'org.eclipse.mdm.api.base'
-include 'org.eclipse.mdm.api.default'
include 'org.eclipse.mdm.api.odsadapter'
include 'org.eclipse.mdm.nucleus'
