Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonald.g.dunne2018-06-07 17:16:05 -0400
committerDonald Dunne2018-06-08 15:31:04 -0400
commit3ddc054d27d4071c1ccef889059a1613b06b34d6 (patch)
tree6c0a9f5ae2abc8f19820ba77340877d71f265d9f
parentcebde0e4766095b0cd7344af8f3e2fad40724822 (diff)
downloadorg.eclipse.osee-3ddc054d27d4071c1ccef889059a1613b06b34d6.tar.gz
org.eclipse.osee-3ddc054d27d4071c1ccef889059a1613b06b34d6.tar.xz
org.eclipse.osee-3ddc054d27d4071c1ccef889059a1613b06b34d6.zip
feature[ats_TW8369]: Rename osee.x.server bundles to osee.server
rename org.eclipse.osee.x.server.application to org.eclipse.osee.server.application rename org.eclipse.osee.x.server.external.feature to org.eclipse.osee.server.external.feature rename org.eclipse.osee.x.server.feature to org.eclipse.osee.server.feature rename org.eclipse.osee.x.server.integration.tests to org.eclipse.osee.server.integration.tests rename org.eclipse.osee.x.server.legacy.feature to org.eclipse.osee.server.legacy.feature rename org.eclipse.osee.x.server.p2 to org.eclipse.osee.server.p2 rename org.eclipse.osee.x.server.parent to org.eclipse.osee.server.parent rename lba.osee.x.server.customizations to lba.osee.server.customizations rename lba.osee.x.server.external.feature to lba.osee.server.external.feature rename lba.osee.x.server.feature to lba.osee.server.feature rename lba.osee.x.server.p2 to lba.osee.server.p2 rename lba.osee.x.server.parent to lba.osee.server.parent Change-Id: Ibbf81789bef5c9a899aea70b2e04575d8819aba5
-rw-r--r--features/org.eclipse.osee.server.external.feature/.project (renamed from features/org.eclipse.osee.x.server.legacy.feature/.project)2
-rw-r--r--features/org.eclipse.osee.server.external.feature/build.properties (renamed from features/org.eclipse.osee.x.server.external.feature/build.properties)0
-rw-r--r--features/org.eclipse.osee.server.external.feature/feature.properties (renamed from features/org.eclipse.osee.x.server.external.feature/feature.properties)0
-rw-r--r--features/org.eclipse.osee.server.external.feature/feature.xml (renamed from features/org.eclipse.osee.x.server.external.feature/feature.xml)4
-rw-r--r--features/org.eclipse.osee.server.external.feature/license.html (renamed from features/org.eclipse.osee.x.server.external.feature/license.html)0
-rw-r--r--features/org.eclipse.osee.server.external.feature/pom.xml (renamed from features/org.eclipse.osee.x.server.external.feature/pom.xml)6
-rw-r--r--features/org.eclipse.osee.server.external.feature/sourceTemplateFeature/.gitkeep (renamed from features/org.eclipse.osee.x.server.external.feature/sourceTemplateFeature/.gitkeep)0
-rw-r--r--features/org.eclipse.osee.server.feature/.project (renamed from features/org.eclipse.osee.x.server.feature/.project)2
-rw-r--r--features/org.eclipse.osee.server.feature/build.properties (renamed from features/org.eclipse.osee.x.server.feature/build.properties)0
-rw-r--r--features/org.eclipse.osee.server.feature/feature.properties (renamed from features/org.eclipse.osee.x.server.feature/feature.properties)0
-rw-r--r--features/org.eclipse.osee.server.feature/feature.xml (renamed from features/org.eclipse.osee.x.server.feature/feature.xml)8
-rw-r--r--features/org.eclipse.osee.server.feature/license.html (renamed from features/org.eclipse.osee.x.server.feature/license.html)0
-rw-r--r--features/org.eclipse.osee.server.feature/pom.xml (renamed from features/org.eclipse.osee.x.server.feature/pom.xml)6
-rw-r--r--features/org.eclipse.osee.server.feature/sourceTemplateFeature/.gitkeep (renamed from features/org.eclipse.osee.x.server.feature/sourceTemplateFeature/.gitkeep)0
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/.project (renamed from features/org.eclipse.osee.x.server.external.feature/.project)2
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/build.properties (renamed from features/org.eclipse.osee.x.server.legacy.feature/build.properties)0
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/feature.properties (renamed from features/org.eclipse.osee.x.server.legacy.feature/feature.properties)0
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/feature.xml (renamed from features/org.eclipse.osee.x.server.legacy.feature/feature.xml)2
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/license.html (renamed from features/org.eclipse.osee.x.server.legacy.feature/license.html)0
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/pom.xml (renamed from features/org.eclipse.osee.x.server.legacy.feature/pom.xml)6
-rw-r--r--features/org.eclipse.osee.server.legacy.feature/sourceTemplateFeature/.gitkeep (renamed from features/org.eclipse.osee.x.server.legacy.feature/sourceTemplateFeature/.gitkeep)0
-rw-r--r--plugins/org.eclipse.osee.app.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.app/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.ats.rest.test.db/README.txt8
-rw-r--r--plugins/org.eclipse.osee.ats.rest.test/AtsServer_Integration_TestSuite.launch6
-rw-r--r--plugins/org.eclipse.osee.client.integration.tests/pom.xml2
-rw-r--r--plugins/org.eclipse.osee.define.api/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.define.rest.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.define.rest/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.authentication.ldap.core/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl.integration/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.dsl/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.model/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.server.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.core.server/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html8
-rw-r--r--plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html2
-rw-r--r--plugins/org.eclipse.osee.framework.server.ide.api/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.framework.server.ide/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.logback.config/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.orcs.rest/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.parent/pom.xml12
-rw-r--r--plugins/org.eclipse.osee.server.application/.classpath (renamed from plugins/org.eclipse.osee.x.server.application/.classpath)0
-rw-r--r--plugins/org.eclipse.osee.server.application/.project (renamed from plugins/org.eclipse.osee.x.server.application/.project)2
-rw-r--r--plugins/org.eclipse.osee.server.application/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF)2
-rw-r--r--plugins/org.eclipse.osee.server.application/OSGI-INF/osee.server.application.xml (renamed from plugins/org.eclipse.osee.x.server.application/OSGI-INF/osee.server.application.xml)2
-rw-r--r--plugins/org.eclipse.osee.server.application/build.properties (renamed from plugins/org.eclipse.osee.x.server.application/build.properties)0
-rw-r--r--plugins/org.eclipse.osee.server.application/pom.xml (renamed from plugins/org.eclipse.osee.x.server.application/pom.xml)6
-rw-r--r--plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/ServerApplication.java (renamed from plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/ServerApplication.java)4
-rw-r--r--plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/ServerHealthEndpointImpl.java (renamed from plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/ServerHealthEndpointImpl.java)8
-rw-r--r--plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/ServerStatus.java (renamed from plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/model/ServerStatus.java)2
-rw-r--r--plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/StatusKey.java (renamed from plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/model/StatusKey.java)2
-rw-r--r--plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/BuildServerStatusOperation.java (renamed from plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/operations/BuildServerStatusOperation.java)6
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/.classpath (renamed from plugins/org.eclipse.osee.x.server.integration.tests/.classpath)0
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/.project (renamed from plugins/org.eclipse.osee.x.server.integration.tests/.project)2
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF)2
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/README_BEFORE_RUNNING_TESTS.txt (renamed from plugins/org.eclipse.osee.x.server.integration.tests/README_BEFORE_RUNNING_TESTS.txt)6
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/build.properties (renamed from plugins/org.eclipse.osee.x.server.integration.tests/build.properties)0
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/logback-test.xml (renamed from plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml)0
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/pom.xml (renamed from plugins/org.eclipse.osee.x.server.integration.tests/pom.xml)12
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/ServerIntegrationTestSuite.java (renamed from plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java)10
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/endpoint/ArtifactEndpointTest.java (renamed from plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/endpoint/ArtifactEndpointTest.java)4
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/endpoint/RestAssuredTest.java (renamed from plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/endpoint/RestAssuredTest.java)2
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/performance/AccountClientTest.java (renamed from plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java)4
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/performance/OseeClientQueryTest.java (renamed from plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java)4
-rw-r--r--plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/util/IntegrationUtil.java (renamed from plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java)2
-rw-r--r--plugins/org.eclipse.osee.server.p2/.project (renamed from plugins/org.eclipse.osee.x.server.p2/.project)2
-rw-r--r--plugins/org.eclipse.osee.server.p2/category.xml14
-rw-r--r--plugins/org.eclipse.osee.server.p2/demo/README.txt (renamed from plugins/org.eclipse.osee.x.server.p2/demo/README.txt)0
-rw-r--r--plugins/org.eclipse.osee.server.p2/demo/binary_data.zip (renamed from plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip)bin330782 -> 330782 bytes
-rw-r--r--plugins/org.eclipse.osee.server.p2/demo/hsql.zip (renamed from plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip)bin288278 -> 288278 bytes
-rw-r--r--plugins/org.eclipse.osee.server.p2/etc/osee.hsql.json (renamed from plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json)0
-rw-r--r--plugins/org.eclipse.osee.server.p2/etc/osee.postgresql.json (renamed from plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json)0
-rw-r--r--plugins/org.eclipse.osee.server.p2/package-server-runtime.xml (renamed from plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml)0
-rw-r--r--plugins/org.eclipse.osee.server.p2/pom.xml (renamed from plugins/org.eclipse.osee.x.server.p2/pom.xml)8
-rw-r--r--plugins/org.eclipse.osee.server.p2/x.server.product (renamed from plugins/org.eclipse.osee.x.server.p2/x.server.product)4
-rw-r--r--plugins/org.eclipse.osee.server.parent/.project (renamed from plugins/org.eclipse.osee.x.server.parent/.project)2
-rw-r--r--plugins/org.eclipse.osee.server.parent/pom.xml (renamed from plugins/org.eclipse.osee.x.server.parent/pom.xml)24
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch6
-rw-r--r--plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch6
-rw-r--r--plugins/org.eclipse.osee.support.maven/osee-build.xml2
-rw-r--r--plugins/org.eclipse.osee.web.ui.test/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.web.ui/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.x.parent/pom.xml4
-rw-r--r--plugins/org.eclipse.osee.x.server.p2/category.xml14
89 files changed, 163 insertions, 163 deletions
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/.project b/features/org.eclipse.osee.server.external.feature/.project
index 01ca818ef8..64f2467920 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/.project
+++ b/features/org.eclipse.osee.server.external.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.legacy.feature</name>
+ <name>org.eclipse.osee.server.external.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.osee.x.server.external.feature/build.properties b/features/org.eclipse.osee.server.external.feature/build.properties
index 96a7ff3867..96a7ff3867 100644
--- a/features/org.eclipse.osee.x.server.external.feature/build.properties
+++ b/features/org.eclipse.osee.server.external.feature/build.properties
diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.properties b/features/org.eclipse.osee.server.external.feature/feature.properties
index 031cc642aa..031cc642aa 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.properties
+++ b/features/org.eclipse.osee.server.external.feature/feature.properties
diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.server.external.feature/feature.xml
index 367fae3816..eab3dcef7f 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.server.external.feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.osee.x.server.external.feature"
+ id="org.eclipse.osee.server.external.feature"
label="%featureName"
version="0.26.0.qualifier"
provider-name="%providerName">
@@ -552,7 +552,7 @@
unpack="false"/>
<plugin
- id="org.eclipse.osee.x.server.application"
+ id="org.eclipse.osee.server.application"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.osee.x.server.external.feature/license.html b/features/org.eclipse.osee.server.external.feature/license.html
index c6af966b61..c6af966b61 100644
--- a/features/org.eclipse.osee.x.server.external.feature/license.html
+++ b/features/org.eclipse.osee.server.external.feature/license.html
diff --git a/features/org.eclipse.osee.x.server.external.feature/pom.xml b/features/org.eclipse.osee.server.external.feature/pom.xml
index ebafee8915..691ea29af6 100644
--- a/features/org.eclipse.osee.x.server.external.feature/pom.xml
+++ b/features/org.eclipse.osee.server.external.feature/pom.xml
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.x.server.external.feature</artifactId>
+ <artifactId>org.eclipse.osee.server.external.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>OSEE X Server External Feature - (Incubation)</name>
diff --git a/features/org.eclipse.osee.x.server.external.feature/sourceTemplateFeature/.gitkeep b/features/org.eclipse.osee.server.external.feature/sourceTemplateFeature/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/features/org.eclipse.osee.x.server.external.feature/sourceTemplateFeature/.gitkeep
+++ b/features/org.eclipse.osee.server.external.feature/sourceTemplateFeature/.gitkeep
diff --git a/features/org.eclipse.osee.x.server.feature/.project b/features/org.eclipse.osee.server.feature/.project
index d219ccaf81..c9acb6bee4 100644
--- a/features/org.eclipse.osee.x.server.feature/.project
+++ b/features/org.eclipse.osee.server.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.feature</name>
+ <name>org.eclipse.osee.server.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.osee.x.server.feature/build.properties b/features/org.eclipse.osee.server.feature/build.properties
index 34dfbf491c..34dfbf491c 100644
--- a/features/org.eclipse.osee.x.server.feature/build.properties
+++ b/features/org.eclipse.osee.server.feature/build.properties
diff --git a/features/org.eclipse.osee.x.server.feature/feature.properties b/features/org.eclipse.osee.server.feature/feature.properties
index 83615cfd65..83615cfd65 100644
--- a/features/org.eclipse.osee.x.server.feature/feature.properties
+++ b/features/org.eclipse.osee.server.feature/feature.properties
diff --git a/features/org.eclipse.osee.x.server.feature/feature.xml b/features/org.eclipse.osee.server.feature/feature.xml
index 26faf2aa57..59439e28e6 100644
--- a/features/org.eclipse.osee.x.server.feature/feature.xml
+++ b/features/org.eclipse.osee.server.feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.osee.x.server.feature"
+ id="org.eclipse.osee.server.feature"
label="%featureName"
version="0.26.0.qualifier"
provider-name="%providerName">
@@ -22,7 +22,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osee.x.server.external.feature"
+ id="org.eclipse.osee.server.external.feature"
version="0.0.0"/>
<includes
@@ -30,7 +30,7 @@
version="0.0.0"/>
<includes
- id="org.eclipse.osee.x.server.legacy.feature"
+ id="org.eclipse.osee.server.legacy.feature"
version="0.0.0"/>
<includes
@@ -75,7 +75,7 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.osee.x.server.application"
+ id="org.eclipse.osee.server.application"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/features/org.eclipse.osee.x.server.feature/license.html b/features/org.eclipse.osee.server.feature/license.html
index c6af966b61..c6af966b61 100644
--- a/features/org.eclipse.osee.x.server.feature/license.html
+++ b/features/org.eclipse.osee.server.feature/license.html
diff --git a/features/org.eclipse.osee.x.server.feature/pom.xml b/features/org.eclipse.osee.server.feature/pom.xml
index c9d57d2d07..654f19c4f7 100644
--- a/features/org.eclipse.osee.x.server.feature/pom.xml
+++ b/features/org.eclipse.osee.server.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.x.server.feature</artifactId>
+ <artifactId>org.eclipse.osee.server.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>OSEE X Server Feature - (Incubation)</name>
diff --git a/features/org.eclipse.osee.x.server.feature/sourceTemplateFeature/.gitkeep b/features/org.eclipse.osee.server.feature/sourceTemplateFeature/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/features/org.eclipse.osee.x.server.feature/sourceTemplateFeature/.gitkeep
+++ b/features/org.eclipse.osee.server.feature/sourceTemplateFeature/.gitkeep
diff --git a/features/org.eclipse.osee.x.server.external.feature/.project b/features/org.eclipse.osee.server.legacy.feature/.project
index 9ee7295e02..820b59134e 100644
--- a/features/org.eclipse.osee.x.server.external.feature/.project
+++ b/features/org.eclipse.osee.server.legacy.feature/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.external.feature</name>
+ <name>org.eclipse.osee.server.legacy.feature</name>
<comment></comment>
<projects>
</projects>
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/build.properties b/features/org.eclipse.osee.server.legacy.feature/build.properties
index 34dfbf491c..34dfbf491c 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/build.properties
+++ b/features/org.eclipse.osee.server.legacy.feature/build.properties
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/feature.properties b/features/org.eclipse.osee.server.legacy.feature/feature.properties
index 0bcd2269b1..0bcd2269b1 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/feature.properties
+++ b/features/org.eclipse.osee.server.legacy.feature/feature.properties
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/feature.xml b/features/org.eclipse.osee.server.legacy.feature/feature.xml
index 35c60bedc3..1632fc2d68 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/feature.xml
+++ b/features/org.eclipse.osee.server.legacy.feature/feature.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
- id="org.eclipse.osee.x.server.legacy.feature"
+ id="org.eclipse.osee.server.legacy.feature"
label="%featureName"
version="0.26.0.qualifier"
provider-name="%providerName">
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/license.html b/features/org.eclipse.osee.server.legacy.feature/license.html
index c6af966b61..c6af966b61 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/license.html
+++ b/features/org.eclipse.osee.server.legacy.feature/license.html
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/pom.xml b/features/org.eclipse.osee.server.legacy.feature/pom.xml
index 67f3c22dce..a0216fd6d8 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/pom.xml
+++ b/features/org.eclipse.osee.server.legacy.feature/pom.xml
@@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.x.server.legacy.feature</artifactId>
+ <artifactId>org.eclipse.osee.server.legacy.feature</artifactId>
<packaging>eclipse-feature</packaging>
<name>OSEE X Server Legacy Feature - (Incubation)</name>
</project> \ No newline at end of file
diff --git a/features/org.eclipse.osee.x.server.legacy.feature/sourceTemplateFeature/.gitkeep b/features/org.eclipse.osee.server.legacy.feature/sourceTemplateFeature/.gitkeep
index e69de29bb2..e69de29bb2 100644
--- a/features/org.eclipse.osee.x.server.legacy.feature/sourceTemplateFeature/.gitkeep
+++ b/features/org.eclipse.osee.server.legacy.feature/sourceTemplateFeature/.gitkeep
diff --git a/plugins/org.eclipse.osee.app.test/pom.xml b/plugins/org.eclipse.osee.app.test/pom.xml
index afb99d5d3d..43c6da883c 100644
--- a/plugins/org.eclipse.osee.app.test/pom.xml
+++ b/plugins/org.eclipse.osee.app.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.app.test</artifactId>
diff --git a/plugins/org.eclipse.osee.app/pom.xml b/plugins/org.eclipse.osee.app/pom.xml
index 84a8ec6756..ae0277f259 100644
--- a/plugins/org.eclipse.osee.app/pom.xml
+++ b/plugins/org.eclipse.osee.app/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.app</artifactId>
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml
index 1aa57e09b5..f0047ab2ee 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/pom.xml
@@ -151,7 +151,7 @@
</taskdef>
<property name="xserver-project"
- value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
+ value="${project.basedir}/../org.eclipse.osee.server.p2" />
<property name="xserver-home" value="${xserver-project}/target/server" />
<property name="xserver-port" value="${ats-server-port}" />
<property name="xserver-telnet-port" value="${ats-server-telnet-port}" />
diff --git a/plugins/org.eclipse.osee.ats.rest.test.db/README.txt b/plugins/org.eclipse.osee.ats.rest.test.db/README.txt
index d30758edcb..39e2458ec0 100644
--- a/plugins/org.eclipse.osee.ats.rest.test.db/README.txt
+++ b/plugins/org.eclipse.osee.ats.rest.test.db/README.txt
@@ -21,9 +21,9 @@ Run the following in a git bash
cd /c/UserData/git_fix/org.eclipse.osee/plugins/org.eclipse.osee.ats.mocks/data
Paste the following in git bash
-cp binary_data.zip ../../../../lba.osee/plugins/lba.osee.x.server.p2/demo/
-cp hsql.zip ../../../../lba.osee/plugins/lba.osee.x.server.p2/demo/
+cp binary_data.zip ../../../../lba.osee/plugins/lba.osee.server.p2/demo/
+cp hsql.zip ../../../../lba.osee/plugins/lba.osee.server.p2/demo/
cp binary_data.zip ../../org.eclipse.osee.orcs.db.mock/data
cp hsql.zip ../../org.eclipse.osee.orcs.db.mock/data
-cp binary_data.zip ../../org.eclipse.osee.x.server.p2/demo
-cp hsql.zip ../../org.eclipse.osee.x.server.p2/demo
+cp binary_data.zip ../../org.eclipse.osee.server.p2/demo
+cp hsql.zip ../../org.eclipse.osee.server.p2/demo
diff --git a/plugins/org.eclipse.osee.ats.rest.test/AtsServer_Integration_TestSuite.launch b/plugins/org.eclipse.osee.ats.rest.test/AtsServer_Integration_TestSuite.launch
index dac5990e98..f46881ae83 100644
--- a/plugins/org.eclipse.osee.ats.rest.test/AtsServer_Integration_TestSuite.launch
+++ b/plugins/org.eclipse.osee.ats.rest.test/AtsServer_Integration_TestSuite.launch
@@ -49,9 +49,9 @@
<setEntry value="org.eclipse.osee.ats.server.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.external.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.external.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/>
+<setEntry value="org.eclipse.osee.server.external.feature:default"/>
+<setEntry value="org.eclipse.osee.server.feature:default"/>
+<setEntry value="org.eclipse.osee.server.legacy.feature:default"/>
</setAttribute>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="timestamp" value="1342550414716"/>
diff --git a/plugins/org.eclipse.osee.client.integration.tests/pom.xml b/plugins/org.eclipse.osee.client.integration.tests/pom.xml
index 9d64b46c4e..c4aff9c018 100644
--- a/plugins/org.eclipse.osee.client.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.client.integration.tests/pom.xml
@@ -146,7 +146,7 @@
</taskdef>
<property name="xserver-project"
- value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
+ value="${project.basedir}/../org.eclipse.osee.server.p2" />
<property name="xserver-home" value="${xserver-project}/target/server" />
<property name="xserver-port" value="${osee-server-port}" />
<property name="xserver-telnet-port" value="${osee-server-telnet-port}" />
diff --git a/plugins/org.eclipse.osee.define.api/pom.xml b/plugins/org.eclipse.osee.define.api/pom.xml
index 535c838073..08cfdc1924 100644
--- a/plugins/org.eclipse.osee.define.api/pom.xml
+++ b/plugins/org.eclipse.osee.define.api/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.define.api</artifactId>
diff --git a/plugins/org.eclipse.osee.define.rest.test/pom.xml b/plugins/org.eclipse.osee.define.rest.test/pom.xml
index cafa92e15a..ca2ceb4c98 100644
--- a/plugins/org.eclipse.osee.define.rest.test/pom.xml
+++ b/plugins/org.eclipse.osee.define.rest.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.define.rest.test</artifactId>
diff --git a/plugins/org.eclipse.osee.define.rest/pom.xml b/plugins/org.eclipse.osee.define.rest/pom.xml
index 14e2cc04cb..1fe70b221d 100644
--- a/plugins/org.eclipse.osee.define.rest/pom.xml
+++ b/plugins/org.eclipse.osee.define.rest/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.define.rest</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.authentication.ldap.core/pom.xml b/plugins/org.eclipse.osee.framework.authentication.ldap.core/pom.xml
index 2bc1d39cbc..3fd71d7516 100644
--- a/plugins/org.eclipse.osee.framework.authentication.ldap.core/pom.xml
+++ b/plugins/org.eclipse.osee.framework.authentication.ldap.core/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.authentication.ldap.core</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/pom.xml b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/pom.xml
index 95d2718001..3ac9fe5ced 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.dsl.integration.test</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/pom.xml b/plugins/org.eclipse.osee.framework.core.dsl.integration/pom.xml
index f80333bb5e..8dd4451422 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl.integration/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.dsl.integration</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/pom.xml b/plugins/org.eclipse.osee.framework.core.dsl/pom.xml
index 3c01ad1b22..4ff4ced244 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.dsl/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.dsl</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/pom.xml b/plugins/org.eclipse.osee.framework.core.model.test/pom.xml
index 24c47e53db..d1935b108e 100644
--- a/plugins/org.eclipse.osee.framework.core.model.test/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.model.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.model.test</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.model/pom.xml b/plugins/org.eclipse.osee.framework.core.model/pom.xml
index 99a2c3cb5c..122f88da2f 100644
--- a/plugins/org.eclipse.osee.framework.core.model/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.model/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.model</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.server.test/pom.xml b/plugins/org.eclipse.osee.framework.core.server.test/pom.xml
index cde67ed048..8a70882621 100644
--- a/plugins/org.eclipse.osee.framework.core.server.test/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.server.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.server.test</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.core.server/pom.xml b/plugins/org.eclipse.osee.framework.core.server/pom.xml
index a874e3a575..03dba23500 100644
--- a/plugins/org.eclipse.osee.framework.core.server/pom.xml
+++ b/plugins/org.eclipse.osee.framework.core.server/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.core.server</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html b/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html
index 48a3a696f9..f34a2f0668 100644
--- a/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html
+++ b/plugins/org.eclipse.osee.framework.dev.help.ui/OSEE/Developers_Guide/Developers-Guide.html
@@ -902,7 +902,7 @@ ${type_declaration}
</li>
<li>org.eclipse.osee.x.parent
<ol>
- <li>org.eclipse.osee.x.server.parent</li>
+ <li>org.eclipse.osee.server.parent</li>
<li>org.eclipse.osee.orcs.parent</li>
<li>org.eclipse.osee.core.server.parent</li>
</ol>
@@ -948,7 +948,7 @@ ${type_declaration}
<td>OSEE Client IDE All-In-One Win32 x86 64-bit</td>
</tr>
<tr>
- <td rowspan="4">plugins/org.eclipse.osee.x.server.p2/target</td>
+ <td rowspan="4">plugins/org.eclipse.osee.server.p2/target</td>
<td>repository/</td>
<td>OSEE Application Server P2 Site </td>
</tr>
@@ -957,11 +957,11 @@ ${type_declaration}
<td>OSEE Application Server</td>
</tr>
<tr>
- <td>org.eclipse.osee.x.server.p2.zip</td>
+ <td>org.eclipse.osee.server.p2.zip</td>
<td>OSEE Application Server Archived Update Site</td>
</tr>
<tr>
- <td>org.eclipse.osee.x.server.runtime.zip</td>
+ <td>org.eclipse.osee.server.runtime.zip</td>
<td>OSEE Application Server Zipped Runtime</td>
</tr>
<tr></tr>
diff --git a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html
index 02ec2a2221..5d462034cd 100644
--- a/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html
+++ b/plugins/org.eclipse.osee.framework.help.ui/OSEE/Users_Guide/Getting_Started/Installation-and-Initialization.html
@@ -48,7 +48,7 @@
<h3 id="Quick_Server_Installation">Quick Server Installation</h3>
<p>If you are interested in a quick start, and are not setting up a custom database installation, setting up the OSEE server with the bundled HSQLDB database is simple.</p>
<ul>
- <li>Create a directory to place your server in, and unzip the downloaded server zip file (e.g. org.eclipse.osee.x.server.runtime.zip) into that directory.</li>
+ <li>Create a directory to place your server in, and unzip the downloaded server zip file (e.g. org.eclipse.osee.server.runtime.zip) into that directory.</li>
</ul>
<p>You should end up with the following files and directories:</p>
<dl>
diff --git a/plugins/org.eclipse.osee.framework.server.ide.api/pom.xml b/plugins/org.eclipse.osee.framework.server.ide.api/pom.xml
index 1cae384f9e..e4ec650002 100644
--- a/plugins/org.eclipse.osee.framework.server.ide.api/pom.xml
+++ b/plugins/org.eclipse.osee.framework.server.ide.api/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.server.ide.api</artifactId>
diff --git a/plugins/org.eclipse.osee.framework.server.ide/pom.xml b/plugins/org.eclipse.osee.framework.server.ide/pom.xml
index 1fc7dbb5ed..ebed584344 100644
--- a/plugins/org.eclipse.osee.framework.server.ide/pom.xml
+++ b/plugins/org.eclipse.osee.framework.server.ide/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.framework.server.ide</artifactId>
diff --git a/plugins/org.eclipse.osee.logback.config/pom.xml b/plugins/org.eclipse.osee.logback.config/pom.xml
index ae025836da..6f3d913158 100644
--- a/plugins/org.eclipse.osee.logback.config/pom.xml
+++ b/plugins/org.eclipse.osee.logback.config/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.logback.config</artifactId>
diff --git a/plugins/org.eclipse.osee.orcs.rest.test/pom.xml b/plugins/org.eclipse.osee.orcs.rest.test/pom.xml
index 414172ad7e..c3c6b2d238 100644
--- a/plugins/org.eclipse.osee.orcs.rest.test/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.rest.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.orcs.rest.test</artifactId>
diff --git a/plugins/org.eclipse.osee.orcs.rest/pom.xml b/plugins/org.eclipse.osee.orcs.rest/pom.xml
index 43a101006e..2379ca9e19 100644
--- a/plugins/org.eclipse.osee.orcs.rest/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.rest/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.orcs.rest</artifactId>
diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml
index b6ba878809..33a92fa9e3 100644
--- a/plugins/org.eclipse.osee.parent/pom.xml
+++ b/plugins/org.eclipse.osee.parent/pom.xml
@@ -524,7 +524,7 @@
</activation>
<properties>
<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
- <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site>
+ <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository</osee-xserver-site>
</properties>
<repositories>
<repository>
@@ -724,7 +724,7 @@
</activation>
<properties>
<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
- <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site>
+ <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository</osee-xserver-site>
</properties>
<repositories>
<repository>
@@ -750,7 +750,7 @@
</activation>
<properties>
<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
- <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site>
+ <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository</osee-xserver-site>
<osee-runtime-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.runtime.p2/target/repository</osee-runtime-site>
</properties>
<repositories>
@@ -782,7 +782,7 @@
</activation>
<properties>
<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
- <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site>
+ <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository</osee-xserver-site>
<osee-runtime-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.runtime.p2/target/repository</osee-runtime-site>
<osee-client-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.client.p2/target/repository</osee-client-site>
<osee-ats-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.ats.p2/target/repository</osee-ats-site>
@@ -826,7 +826,7 @@
</activation>
<properties>
<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
- <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site>
+ <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository</osee-xserver-site>
<osee-runtime-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.runtime.p2/target/repository</osee-runtime-site>
<osee-client-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.client.p2/target/repository</osee-client-site>
</properties>
@@ -864,7 +864,7 @@
</activation>
<properties>
<eclipse-ip-site>${git-repo-root}/org.eclipse.ip/org.eclipse.ip.p2/target/repository</eclipse-ip-site>
- <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.x.server.p2/target/repository</osee-xserver-site>
+ <osee-xserver-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.server.p2/target/repository</osee-xserver-site>
<osee-runtime-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.runtime.p2/target/repository</osee-runtime-site>
<osee-client-site>${git-repo-root}/org.eclipse.osee/plugins/org.eclipse.osee.client.p2/target/repository</osee-client-site>
diff --git a/plugins/org.eclipse.osee.x.server.application/.classpath b/plugins/org.eclipse.osee.server.application/.classpath
index 1fa3e6803d..1fa3e6803d 100644
--- a/plugins/org.eclipse.osee.x.server.application/.classpath
+++ b/plugins/org.eclipse.osee.server.application/.classpath
diff --git a/plugins/org.eclipse.osee.x.server.application/.project b/plugins/org.eclipse.osee.server.application/.project
index 10d2165ed7..b2215c8f5a 100644
--- a/plugins/org.eclipse.osee.x.server.application/.project
+++ b/plugins/org.eclipse.osee.server.application/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.application</name>
+ <name>org.eclipse.osee.server.application</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.server.application/META-INF/MANIFEST.MF
index dc95b7ff60..2fccd17ce2 100644
--- a/plugins/org.eclipse.osee.x.server.application/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.server.application/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSEE X Server Application
-Bundle-SymbolicName: org.eclipse.osee.x.server.application
+Bundle-SymbolicName: org.eclipse.osee.server.application
Bundle-Version: 0.26.0.qualifier
Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
diff --git a/plugins/org.eclipse.osee.x.server.application/OSGI-INF/osee.server.application.xml b/plugins/org.eclipse.osee.server.application/OSGI-INF/osee.server.application.xml
index 891c36b379..28f021f760 100644
--- a/plugins/org.eclipse.osee.x.server.application/OSGI-INF/osee.server.application.xml
+++ b/plugins/org.eclipse.osee.server.application/OSGI-INF/osee.server.application.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop">
- <implementation class="org.eclipse.osee.x.server.application.ServerApplication"/>
+ <implementation class="org.eclipse.osee.server.application.ServerApplication"/>
<service>
<provide interface="javax.ws.rs.core.Application"/>
</service>
diff --git a/plugins/org.eclipse.osee.x.server.application/build.properties b/plugins/org.eclipse.osee.server.application/build.properties
index c58ea2178c..c58ea2178c 100644
--- a/plugins/org.eclipse.osee.x.server.application/build.properties
+++ b/plugins/org.eclipse.osee.server.application/build.properties
diff --git a/plugins/org.eclipse.osee.x.server.application/pom.xml b/plugins/org.eclipse.osee.server.application/pom.xml
index bd9d5055fb..8c8235b8db 100644
--- a/plugins/org.eclipse.osee.x.server.application/pom.xml
+++ b/plugins/org.eclipse.osee.server.application/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.x.server.application</artifactId>
+ <artifactId>org.eclipse.osee.server.application</artifactId>
<packaging>eclipse-plugin</packaging>
<name>OSEE X Server Application - (Incubation)</name>
diff --git a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/ServerApplication.java b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/ServerApplication.java
index 8c32690b42..10822951b4 100644
--- a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/ServerApplication.java
+++ b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/ServerApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.application;
+package org.eclipse.osee.server.application;
import java.util.HashSet;
import java.util.Map;
@@ -20,7 +20,7 @@ import org.eclipse.osee.activity.api.ActivityLog;
import org.eclipse.osee.framework.core.server.IApplicationServerManager;
import org.eclipse.osee.framework.core.server.IAuthenticationManager;
import org.eclipse.osee.jdbc.JdbcService;
-import org.eclipse.osee.x.server.application.internal.ServerHealthEndpointImpl;
+import org.eclipse.osee.server.application.internal.ServerHealthEndpointImpl;
/**
* @author Roberto E. Escobar
diff --git a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/ServerHealthEndpointImpl.java b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/ServerHealthEndpointImpl.java
index 0c4d8719f7..60b4f10e45 100644
--- a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/ServerHealthEndpointImpl.java
+++ b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/ServerHealthEndpointImpl.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.application.internal;
+package org.eclipse.osee.server.application.internal;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -32,9 +32,9 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.jdbc.JdbcClient;
import org.eclipse.osee.jdbc.JdbcClientConfig;
import org.eclipse.osee.jdbc.JdbcService;
-import org.eclipse.osee.x.server.application.internal.model.ServerStatus;
-import org.eclipse.osee.x.server.application.internal.model.StatusKey;
-import org.eclipse.osee.x.server.application.internal.operations.BuildServerStatusOperation;
+import org.eclipse.osee.server.application.internal.model.ServerStatus;
+import org.eclipse.osee.server.application.internal.model.StatusKey;
+import org.eclipse.osee.server.application.internal.operations.BuildServerStatusOperation;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/model/ServerStatus.java b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/ServerStatus.java
index 40814e1ea5..c79a139162 100644
--- a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/model/ServerStatus.java
+++ b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/ServerStatus.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.application.internal.model;
+package org.eclipse.osee.server.application.internal.model;
import java.util.HashMap;
import java.util.LinkedList;
diff --git a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/model/StatusKey.java b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/StatusKey.java
index 0e5e5c77ee..58cb91c277 100644
--- a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/model/StatusKey.java
+++ b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/model/StatusKey.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.application.internal.model;
+package org.eclipse.osee.server.application.internal.model;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/operations/BuildServerStatusOperation.java b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/BuildServerStatusOperation.java
index b92d80cf8b..e9a8f6fa7e 100644
--- a/plugins/org.eclipse.osee.x.server.application/src/org/eclipse/osee/x/server/application/internal/operations/BuildServerStatusOperation.java
+++ b/plugins/org.eclipse.osee.server.application/src/org/eclipse/osee/server/application/internal/operations/BuildServerStatusOperation.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.application.internal.operations;
+package org.eclipse.osee.server.application.internal.operations;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
@@ -26,8 +26,8 @@ import org.eclipse.osee.framework.core.server.IApplicationServerManager;
import org.eclipse.osee.framework.core.server.IAuthenticationManager;
import org.eclipse.osee.framework.core.server.OseeServerProperties;
import org.eclipse.osee.framework.jdk.core.util.Lib;
-import org.eclipse.osee.x.server.application.internal.model.ServerStatus;
-import org.eclipse.osee.x.server.application.internal.model.StatusKey;
+import org.eclipse.osee.server.application.internal.model.ServerStatus;
+import org.eclipse.osee.server.application.internal.model.StatusKey;
/**
* @author Donald G. Dunne
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/.classpath b/plugins/org.eclipse.osee.server.integration.tests/.classpath
index 1fa3e6803d..1fa3e6803d 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/.classpath
+++ b/plugins/org.eclipse.osee.server.integration.tests/.classpath
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/.project b/plugins/org.eclipse.osee.server.integration.tests/.project
index d020ef9b57..7b922af9ff 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/.project
+++ b/plugins/org.eclipse.osee.server.integration.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.integration.tests</name>
+ <name>org.eclipse.osee.server.integration.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.server.integration.tests/META-INF/MANIFEST.MF
index af9f34f534..2928767380 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.server.integration.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: OSEE X Server Integration Tests
-Bundle-SymbolicName: org.eclipse.osee.x.server.integration.tests
+Bundle-SymbolicName: org.eclipse.osee.server.integration.tests
Bundle-Version: 0.26.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/README_BEFORE_RUNNING_TESTS.txt b/plugins/org.eclipse.osee.server.integration.tests/README_BEFORE_RUNNING_TESTS.txt
index 63b1c4caba..cd51f64c02 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/README_BEFORE_RUNNING_TESTS.txt
+++ b/plugins/org.eclipse.osee.server.integration.tests/README_BEFORE_RUNNING_TESTS.txt
@@ -1,10 +1,10 @@
DO NOT RUN THIS SUITE AS JUNIT PLUGIN TEST (it will connect to Production DB)
This is an integration test suite run with Application Server. During the build, the pom.xml file calls to expand
-the org.eclipse.osee.x.server.p2/demo database zips into target area, and then launches an OSEE Application Server at that path.
+the org.eclipse.osee.server.p2/demo database zips into target area, and then launches an OSEE Application Server at that path.
S
To run test locally:
-1) unzip org.eclipse.osee.x.server.p2/demo/hsql.zip to your home dir
-2) unzip org.eclipse.osee.x.server.p2/demo/binary_data.zip to your home dir
+1) unzip org.eclipse.osee.server.p2/demo/hsql.zip to your home dir
+2) unzip org.eclipse.osee.server.p2/demo/binary_data.zip to your home dir
3) Launch local hsql application server
4) Run ServerIntegrationTestSuite launch config
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/build.properties b/plugins/org.eclipse.osee.server.integration.tests/build.properties
index 34d2e4d2da..34d2e4d2da 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/build.properties
+++ b/plugins/org.eclipse.osee.server.integration.tests/build.properties
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml b/plugins/org.eclipse.osee.server.integration.tests/logback-test.xml
index 6e2c97abe6..6e2c97abe6 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/logback-test.xml
+++ b/plugins/org.eclipse.osee.server.integration.tests/logback-test.xml
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml b/plugins/org.eclipse.osee.server.integration.tests/pom.xml
index 9cdda2d387..f41e729bdc 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/pom.xml
+++ b/plugins/org.eclipse.osee.server.integration.tests/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.x.server.integration.tests</artifactId>
+ <artifactId>org.eclipse.osee.server.integration.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>
<name>OSEE X Server Integration Tests (Incubation)</name>
@@ -21,8 +21,8 @@
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<configuration>
- <testSuite>org.eclipse.osee.x.server.integration.tests</testSuite>
- <testClass>org.eclipse.osee.x.server.integration.tests.ServerIntegrationTestSuite</testClass>
+ <testSuite>org.eclipse.osee.server.integration.tests</testSuite>
+ <testClass>org.eclipse.osee.server.integration.tests.ServerIntegrationTestSuite</testClass>
<systemProperties combine.children="append">
<osee.log.default>WARNING</osee.log.default>
<eventDebug>log</eventDebug>
@@ -192,7 +192,7 @@
</taskdef>
<property name="xserver-project"
- value="${project.basedir}/../org.eclipse.osee.x.server.p2" />
+ value="${project.basedir}/../org.eclipse.osee.server.p2" />
<property name="xserver-home" value="${xserver-project}/target/server" />
<property name="xserver-port" value="${osee-server-port}" />
<property name="xserver-telnet-port" value="${osee-server-telnet-port}" />
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/ServerIntegrationTestSuite.java
index 736cab1c00..4a342059a0 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/ServerIntegrationTestSuite.java
+++ b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/ServerIntegrationTestSuite.java
@@ -8,12 +8,12 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.integration.tests;
+package org.eclipse.osee.server.integration.tests;
-import org.eclipse.osee.x.server.integration.tests.endpoint.ArtifactEndpointTest;
-import org.eclipse.osee.x.server.integration.tests.endpoint.RestAssuredTest;
-import org.eclipse.osee.x.server.integration.tests.performance.AccountClientTest;
-import org.eclipse.osee.x.server.integration.tests.performance.OseeClientQueryTest;
+import org.eclipse.osee.server.integration.tests.endpoint.ArtifactEndpointTest;
+import org.eclipse.osee.server.integration.tests.endpoint.RestAssuredTest;
+import org.eclipse.osee.server.integration.tests.performance.AccountClientTest;
+import org.eclipse.osee.server.integration.tests.performance.OseeClientQueryTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/endpoint/ArtifactEndpointTest.java b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/endpoint/ArtifactEndpointTest.java
index d7cfe993d7..6a3cb6d93e 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/endpoint/ArtifactEndpointTest.java
+++ b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/endpoint/ArtifactEndpointTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.integration.tests.endpoint;
+package org.eclipse.osee.server.integration.tests.endpoint;
import static org.eclipse.osee.framework.core.enums.CoreBranches.COMMON;
import java.util.Arrays;
@@ -24,7 +24,7 @@ import org.eclipse.osee.orcs.rest.model.search.artifact.RequestType;
import org.eclipse.osee.orcs.rest.model.search.artifact.SearchMethod;
import org.eclipse.osee.orcs.rest.model.search.artifact.SearchRequest;
import org.eclipse.osee.orcs.rest.model.search.artifact.SearchResponse;
-import org.eclipse.osee.x.server.integration.tests.util.IntegrationUtil;
+import org.eclipse.osee.server.integration.tests.util.IntegrationUtil;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/endpoint/RestAssuredTest.java b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/endpoint/RestAssuredTest.java
index 3a8ee8886f..5570aa9e99 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/endpoint/RestAssuredTest.java
+++ b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/endpoint/RestAssuredTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.integration.tests.endpoint;
+package org.eclipse.osee.server.integration.tests.endpoint;
import static io.restassured.RestAssured.given;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/performance/AccountClientTest.java
index f02813d4e0..f241db5a68 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/AccountClientTest.java
+++ b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/performance/AccountClientTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.integration.tests.performance;
+package org.eclipse.osee.server.integration.tests.performance;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -23,7 +23,7 @@ import org.eclipse.osee.account.rest.model.AccountInput;
import org.eclipse.osee.account.rest.model.AccountPreferencesData;
import org.eclipse.osee.framework.jdk.core.type.OseeStateException;
import org.eclipse.osee.framework.jdk.core.type.ResultSet;
-import org.eclipse.osee.x.server.integration.tests.util.IntegrationUtil;
+import org.eclipse.osee.server.integration.tests.util.IntegrationUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/performance/OseeClientQueryTest.java
index fa15f35ff3..8bc34e21c6 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/performance/OseeClientQueryTest.java
+++ b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/performance/OseeClientQueryTest.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.integration.tests.performance;
+package org.eclipse.osee.server.integration.tests.performance;
import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.Folder;
import static org.eclipse.osee.framework.core.enums.CoreArtifactTypes.GeneralData;
@@ -34,7 +34,7 @@ import org.eclipse.osee.framework.core.enums.SystemUser;
import org.eclipse.osee.orcs.rest.client.OseeClient;
import org.eclipse.osee.orcs.rest.model.search.artifact.RequestType;
import org.eclipse.osee.orcs.rest.model.search.artifact.SearchResult;
-import org.eclipse.osee.x.server.integration.tests.util.IntegrationUtil;
+import org.eclipse.osee.server.integration.tests.util.IntegrationUtil;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/util/IntegrationUtil.java
index 939689fa0d..3278b1d43b 100644
--- a/plugins/org.eclipse.osee.x.server.integration.tests/src/org/eclipse/osee/x/server/integration/tests/util/IntegrationUtil.java
+++ b/plugins/org.eclipse.osee.server.integration.tests/src/org/eclipse/osee/server/integration/tests/util/IntegrationUtil.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.x.server.integration.tests.util;
+package org.eclipse.osee.server.integration.tests.util;
import static org.eclipse.osee.framework.core.data.OseeClient.OSEE_APPLICATION_SERVER;
import java.util.HashMap;
diff --git a/plugins/org.eclipse.osee.x.server.p2/.project b/plugins/org.eclipse.osee.server.p2/.project
index 46c2970274..35a110d0a4 100644
--- a/plugins/org.eclipse.osee.x.server.p2/.project
+++ b/plugins/org.eclipse.osee.server.p2/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.p2</name>
+ <name>org.eclipse.osee.server.p2</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.server.p2/category.xml b/plugins/org.eclipse.osee.server.p2/category.xml
new file mode 100644
index 0000000000..63f332a052
--- /dev/null
+++ b/plugins/org.eclipse.osee.server.p2/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.osee.server.feature_0.26.0.qualifier.jar" id="org.eclipse.osee.server.feature" version="0.26.0.qualifier">
+ <category name="org.eclipse.osee.server"/>
+ </feature>
+ <feature url="features/org.eclipse.osee.server.feature.source_0.26.0.qualifier.jar" id="org.eclipse.osee.server.feature.source" version="0.26.0.qualifier">
+ <category name="org.eclipse.osee.server"/>
+ </feature>
+ <category-def name="org.eclipse.osee.server" label="Eclipse OSEE Application Server X - (Incubation)">
+ <description>
+ Eclipse OSEE Application Server - (Incubation)
+ </description>
+ </category-def>
+</site>
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/README.txt b/plugins/org.eclipse.osee.server.p2/demo/README.txt
index 49f5e12695..49f5e12695 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/README.txt
+++ b/plugins/org.eclipse.osee.server.p2/demo/README.txt
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip b/plugins/org.eclipse.osee.server.p2/demo/binary_data.zip
index 8a34e53df9..8a34e53df9 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip
+++ b/plugins/org.eclipse.osee.server.p2/demo/binary_data.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip b/plugins/org.eclipse.osee.server.p2/demo/hsql.zip
index 107555a1c6..107555a1c6 100644
--- a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip
+++ b/plugins/org.eclipse.osee.server.p2/demo/hsql.zip
Binary files differ
diff --git a/plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json b/plugins/org.eclipse.osee.server.p2/etc/osee.hsql.json
index 36f4e8fa29..36f4e8fa29 100644
--- a/plugins/org.eclipse.osee.x.server.p2/etc/osee.hsql.json
+++ b/plugins/org.eclipse.osee.server.p2/etc/osee.hsql.json
diff --git a/plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json b/plugins/org.eclipse.osee.server.p2/etc/osee.postgresql.json
index 6a05df87d5..6a05df87d5 100644
--- a/plugins/org.eclipse.osee.x.server.p2/etc/osee.postgresql.json
+++ b/plugins/org.eclipse.osee.server.p2/etc/osee.postgresql.json
diff --git a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml b/plugins/org.eclipse.osee.server.p2/package-server-runtime.xml
index a77c55d126..a77c55d126 100644
--- a/plugins/org.eclipse.osee.x.server.p2/package-server-runtime.xml
+++ b/plugins/org.eclipse.osee.server.p2/package-server-runtime.xml
diff --git a/plugins/org.eclipse.osee.x.server.p2/pom.xml b/plugins/org.eclipse.osee.server.p2/pom.xml
index ff2cef85f4..0c4bc16276 100644
--- a/plugins/org.eclipse.osee.x.server.p2/pom.xml
+++ b/plugins/org.eclipse.osee.server.p2/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
- <artifactId>org.eclipse.osee.x.server.p2</artifactId>
+ <artifactId>org.eclipse.osee.server.p2</artifactId>
<packaging>eclipse-repository</packaging>
<name>OSEE X Server - p2 Site (Incubation)</name>
<version>0.26.0-SNAPSHOT</version>
@@ -34,7 +34,7 @@
</classpath>
</taskdef>
- <property name="output-name" value="org.eclipse.osee.x.server.runtime" />
+ <property name="output-name" value="org.eclipse.osee.server.runtime" />
<property name="p2-content-path" value="${project.build.directory}/repository" />
<property name="output-path" value="${project.build.directory}" />
<property name="server-path" value="${output-path}/server" />
diff --git a/plugins/org.eclipse.osee.x.server.p2/x.server.product b/plugins/org.eclipse.osee.server.p2/x.server.product
index 1ef1ad6766..ab75ac41d4 100644
--- a/plugins/org.eclipse.osee.x.server.p2/x.server.product
+++ b/plugins/org.eclipse.osee.server.p2/x.server.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="OSEE Application Server X (Incubation)" uid="org.eclipse.osee.x.server.product" version="0.26.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="OSEE Application Server X (Incubation)" uid="org.eclipse.osee.server.product" version="0.26.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
@@ -36,7 +36,7 @@
</plugins>
<features>
- <feature id="org.eclipse.osee.x.server.feature"/>
+ <feature id="org.eclipse.osee.server.feature"/>
</features>
diff --git a/plugins/org.eclipse.osee.x.server.parent/.project b/plugins/org.eclipse.osee.server.parent/.project
index 7861807a49..0f23b0f028 100644
--- a/plugins/org.eclipse.osee.x.server.parent/.project
+++ b/plugins/org.eclipse.osee.server.parent/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.osee.x.server.parent</name>
+ <name>org.eclipse.osee.server.parent</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.server.parent/pom.xml
index d425f2f0e2..e98bde9bd6 100644
--- a/plugins/org.eclipse.osee.x.server.parent/pom.xml
+++ b/plugins/org.eclipse.osee.server.parent/pom.xml
@@ -11,7 +11,7 @@
</parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<packaging>pom</packaging>
<name>OSEE X Server - Parent (Incubation)</name>
<version>0.26.0-SNAPSHOT</version>
@@ -42,14 +42,14 @@
<module>../../plugins/org.eclipse.osee.web.ui</module>
<!-- <module>../../plugins/org.eclipse.osee.web.ui.test</module> -->
- <module>../../features/org.eclipse.osee.x.server.legacy.feature</module>
+ <module>../../features/org.eclipse.osee.server.legacy.feature</module>
- <module>../../features/org.eclipse.osee.x.server.feature</module>
- <module>../../features/org.eclipse.osee.x.server.external.feature</module>
+ <module>../../features/org.eclipse.osee.server.feature</module>
+ <module>../../features/org.eclipse.osee.server.external.feature</module>
- <module>../../plugins/org.eclipse.osee.x.server.p2</module>
- <module>../../plugins/org.eclipse.osee.x.server.application</module>
- <!-- <module>../../plugins/org.eclipse.osee.x.server.integration.tests</module> -->
+ <module>../../plugins/org.eclipse.osee.server.p2</module>
+ <module>../../plugins/org.eclipse.osee.server.application</module>
+ <!-- <module>../../plugins/org.eclipse.osee.server.integration.tests</module> -->
</modules>
</profile>
@@ -77,13 +77,13 @@
<module>../../plugins/org.eclipse.osee.web.ui</module>
<!-- <module>../../plugins/org.eclipse.osee.web.ui.test</module> -->
- <module>../../features/org.eclipse.osee.x.server.legacy.feature</module>
+ <module>../../features/org.eclipse.osee.server.legacy.feature</module>
- <module>../../features/org.eclipse.osee.x.server.feature</module>
- <module>../../features/org.eclipse.osee.x.server.external.feature</module>
+ <module>../../features/org.eclipse.osee.server.feature</module>
+ <module>../../features/org.eclipse.osee.server.external.feature</module>
- <module>../../plugins/org.eclipse.osee.x.server.p2</module>
- <module>../../plugins/org.eclipse.osee.x.server.integration.tests</module>
+ <module>../../plugins/org.eclipse.osee.server.p2</module>
+ <module>../../plugins/org.eclipse.osee.server.integration.tests</module>
</modules>
</profile>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
index 4a2671b2de..1d8b90dcb6 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch
@@ -30,9 +30,9 @@
<setEntry value="org.eclipse.osee.ats.server.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.external.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.external.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/>
+<setEntry value="org.eclipse.osee.server.external.feature:default"/>
+<setEntry value="org.eclipse.osee.server.feature:default"/>
+<setEntry value="org.eclipse.osee.server.legacy.feature:default"/>
</setAttribute>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="timestamp" value="1369262663070"/>
diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch
index 1e47402067..31479b20ea 100644
--- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch
+++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch
@@ -29,9 +29,9 @@
<setEntry value="org.eclipse.osee.ats.server.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.external.feature:default"/>
<setEntry value="org.eclipse.osee.core.server.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.external.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.feature:default"/>
-<setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/>
+<setEntry value="org.eclipse.osee.server.external.feature:default"/>
+<setEntry value="org.eclipse.osee.server.feature:default"/>
+<setEntry value="org.eclipse.osee.server.legacy.feature:default"/>
</setAttribute>
<booleanAttribute key="show_selected_only" value="true"/>
<stringAttribute key="target_bundles" value="org.postgresql.driver@default:default"/>
diff --git a/plugins/org.eclipse.osee.support.maven/osee-build.xml b/plugins/org.eclipse.osee.support.maven/osee-build.xml
index 1285ba8695..c21f0d259c 100644
--- a/plugins/org.eclipse.osee.support.maven/osee-build.xml
+++ b/plugins/org.eclipse.osee.support.maven/osee-build.xml
@@ -46,7 +46,7 @@
</case>
<case value="x-server">
<property name="osee-build-stage" value="osee-x-server" />
- <property name="osee-build-directory" value="org.eclipse.osee.x.server.parent" />
+ <property name="osee-build-directory" value="org.eclipse.osee.server.parent" />
</case>
<case value="runtime">
<property name="osee-build-stage" value="osee-client-runtime" />
diff --git a/plugins/org.eclipse.osee.web.ui.test/pom.xml b/plugins/org.eclipse.osee.web.ui.test/pom.xml
index cd658ba9c4..6025d8c422 100644
--- a/plugins/org.eclipse.osee.web.ui.test/pom.xml
+++ b/plugins/org.eclipse.osee.web.ui.test/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.web.ui.test</artifactId>
diff --git a/plugins/org.eclipse.osee.web.ui/pom.xml b/plugins/org.eclipse.osee.web.ui/pom.xml
index b0ddea0284..ef91824d34 100644
--- a/plugins/org.eclipse.osee.web.ui/pom.xml
+++ b/plugins/org.eclipse.osee.web.ui/pom.xml
@@ -5,9 +5,9 @@
<parent>
<groupId>org.eclipse.osee</groupId>
- <artifactId>org.eclipse.osee.x.server.parent</artifactId>
+ <artifactId>org.eclipse.osee.server.parent</artifactId>
<version>0.26.0-SNAPSHOT</version>
- <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath>
+ <relativePath>../../plugins/org.eclipse.osee.server.parent</relativePath>
</parent>
<artifactId>org.eclipse.osee.web.ui</artifactId>
diff --git a/plugins/org.eclipse.osee.x.parent/pom.xml b/plugins/org.eclipse.osee.x.parent/pom.xml
index 864455c8cc..2d4c2e996a 100644
--- a/plugins/org.eclipse.osee.x.parent/pom.xml
+++ b/plugins/org.eclipse.osee.x.parent/pom.xml
@@ -21,7 +21,7 @@
<module>../../plugins/org.eclipse.osee.orcs.parent</module>
<module>../../plugins/org.eclipse.osee.disposition.parent</module>
<module>../../plugins/org.eclipse.osee.ats.server.parent</module>
- <module>../../plugins/org.eclipse.osee.x.server.parent</module>
- <module>../../plugins/org.eclipse.osee.x.server.application</module>
+ <module>../../plugins/org.eclipse.osee.server.parent</module>
+ <module>../../plugins/org.eclipse.osee.server.application</module>
</modules>
</project>
diff --git a/plugins/org.eclipse.osee.x.server.p2/category.xml b/plugins/org.eclipse.osee.x.server.p2/category.xml
deleted file mode 100644
index 60892890fa..0000000000
--- a/plugins/org.eclipse.osee.x.server.p2/category.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.osee.x.server.feature_0.26.0.qualifier.jar" id="org.eclipse.osee.x.server.feature" version="0.26.0.qualifier">
- <category name="org.eclipse.osee.x.server"/>
- </feature>
- <feature url="features/org.eclipse.osee.x.server.feature.source_0.26.0.qualifier.jar" id="org.eclipse.osee.x.server.feature.source" version="0.26.0.qualifier">
- <category name="org.eclipse.osee.x.server"/>
- </feature>
- <category-def name="org.eclipse.osee.x.server" label="Eclipse OSEE Application Server X - (Incubation)">
- <description>
- Eclipse OSEE Application Server X - (Incubation)
- </description>
- </category-def>
-</site>

Back to the top