Monorepo reorg

eclipse · Dec 3, 2020 · b95551c · b95551c
1 parent 65d2e6a
commit b95551c
Show file tree

Hide file tree

Showing 52 changed files with 299 additions and 300 deletions.
diff --git a/.github/workflows/maven.yml → .github/workflows/maven-store.yml b/.github/workflows/maven.yml → .github/workflows/maven-store.yml
@@ -1,28 +1,27 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: CI
+name: CI Store
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
   schedule:
     # catch SNAPSHOT breaking changes, check before THU OSLC calls and on Sat
-    - cron: "30 4 * * 4,6" 
+    - cron: "30 4 * * 4,6"
   workflow_dispatch:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B package --file src/pom.xml
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: mvn -B package --file store/src/pom.xml
diff --git a/.gitignore → store/.gitignore b/.gitignore → store/.gitignore
diff --git a/CHANGELOG.md → store/CHANGELOG.md b/CHANGELOG.md → store/CHANGELOG.md
diff --git a/LICENSE → store/LICENSE b/LICENSE → store/LICENSE
diff --git a/README.md → store/README.md b/README.md → store/README.md
diff --git a/doc/build.md → store/doc/build.md b/doc/build.md → store/doc/build.md
diff --git a/doc/lyo_store-architecture.png → store/doc/lyo_store-architecture.png b/doc/lyo_store-architecture.png → store/doc/lyo_store-architecture.png
diff --git a/doc/store.md → store/doc/store.md b/doc/store.md → store/doc/store.md
diff --git a/doc/store.wiki → store/doc/store.wiki b/doc/store.wiki → store/doc/store.wiki
diff --git a/src/pom.xml → store/src/pom.xml b/src/pom.xml → store/src/pom.xml
diff --git a/src/store-core/.gitignore → store/src/store-core/.gitignore b/src/store-core/.gitignore → store/src/store-core/.gitignore
diff --git a/src/store-core/pom.xml → store/src/store-core/pom.xml b/src/store-core/pom.xml → store/src/store-core/pom.xml
diff --git a/src/store-core/representations.aird → store/src/store-core/representations.aird b/src/store-core/representations.aird → store/src/store-core/representations.aird
diff --git a/...ore/src/license/eplv1/description.txt.ftl → ...ore/src/license/eplv1/description.txt.ftl b/...ore/src/license/eplv1/description.txt.ftl → ...ore/src/license/eplv1/description.txt.ftl
diff --git a/...ore-core/src/license/eplv1/header.txt.ftl → ...ore-core/src/license/eplv1/header.txt.ftl b/...ore-core/src/license/eplv1/header.txt.ftl → ...ore-core/src/license/eplv1/header.txt.ftl
diff --git a/src/store-core/src/license/eplv1/license.txt → .../store-core/src/license/eplv1/license.txt b/src/store-core/src/license/eplv1/license.txt → .../store-core/src/license/eplv1/license.txt
diff --git a/...tore-core/src/license/licenses.properties → ...tore-core/src/license/licenses.properties b/...tore-core/src/license/licenses.properties → ...tore-core/src/license/licenses.properties
diff --git a/...yo/store/ModelUnmarshallingException.java → ...yo/store/ModelUnmarshallingException.java b/...yo/store/ModelUnmarshallingException.java → ...yo/store/ModelUnmarshallingException.java
diff --git a/...ain/java/org/eclipse/lyo/store/Store.java → ...ain/java/org/eclipse/lyo/store/Store.java b/...ain/java/org/eclipse/lyo/store/Store.java → ...ain/java/org/eclipse/lyo/store/Store.java
diff --git a/...lipse/lyo/store/StoreAccessException.java → ...lipse/lyo/store/StoreAccessException.java b/...lipse/lyo/store/StoreAccessException.java → ...lipse/lyo/store/StoreAccessException.java
diff --git a/...a/org/eclipse/lyo/store/StoreFactory.java → ...a/org/eclipse/lyo/store/StoreFactory.java b/...a/org/eclipse/lyo/store/StoreFactory.java → ...a/org/eclipse/lyo/store/StoreFactory.java
diff --git a/...java/org/eclipse/lyo/store/StorePool.java → ...java/org/eclipse/lyo/store/StorePool.java b/...java/org/eclipse/lyo/store/StorePool.java → ...java/org/eclipse/lyo/store/StorePool.java
diff --git a/...e/lyo/store/internals/DatasetBuilder.java → ...e/lyo/store/internals/DatasetBuilder.java b/...e/lyo/store/internals/DatasetBuilder.java → ...e/lyo/store/internals/DatasetBuilder.java
diff --git a/...lyo/store/internals/JenaTdbStoreImpl.java → ...lyo/store/internals/JenaTdbStoreImpl.java b/...lyo/store/internals/JenaTdbStoreImpl.java → ...lyo/store/internals/JenaTdbStoreImpl.java
diff --git a/.../lyo/store/internals/SparqlStoreImpl.java → .../lyo/store/internals/SparqlStoreImpl.java b/.../lyo/store/internals/SparqlStoreImpl.java → .../lyo/store/internals/SparqlStoreImpl.java
diff --git a/...pse/lyo/store/internals/package-info.java → ...pse/lyo/store/internals/package-info.java b/...pse/lyo/store/internals/package-info.java → ...pse/lyo/store/internals/package-info.java
diff --git a/...rnals/query/DatasetQueryExecutorImpl.java → ...rnals/query/DatasetQueryExecutorImpl.java b/...rnals/query/DatasetQueryExecutorImpl.java → ...rnals/query/DatasetQueryExecutorImpl.java
diff --git a/...re/internals/query/JenaQueryExecutor.java → ...re/internals/query/JenaQueryExecutor.java b/...re/internals/query/JenaQueryExecutor.java → ...re/internals/query/JenaQueryExecutor.java
diff --git a/...ery/SparqlQueryExecutorBasicAuthImpl.java → ...ery/SparqlQueryExecutorBasicAuthImpl.java b/...ery/SparqlQueryExecutorBasicAuthImpl.java → ...ery/SparqlQueryExecutorBasicAuthImpl.java
diff --git a/...ernals/query/SparqlQueryExecutorImpl.java → ...ernals/query/SparqlQueryExecutorImpl.java b/...ernals/query/SparqlQueryExecutorImpl.java → ...ernals/query/SparqlQueryExecutorImpl.java
diff --git a/...o/store/internals/query/package-info.java → ...o/store/internals/query/package-info.java b/...o/store/internals/query/package-info.java → ...o/store/internals/query/package-info.java
diff --git a/...a/org/eclipse/lyo/store/package-info.java → ...a/org/eclipse/lyo/store/package-info.java b/...a/org/eclipse/lyo/store/package-info.java → ...a/org/eclipse/lyo/store/package-info.java
diff --git a/...store-core/src/main/javadoc/overview.html → ...store-core/src/main/javadoc/overview.html b/...store-core/src/main/javadoc/overview.html → ...store-core/src/main/javadoc/overview.html
diff --git a/...eclipse/lyo/store/DatasetBuilderTest.java → ...eclipse/lyo/store/DatasetBuilderTest.java b/...eclipse/lyo/store/DatasetBuilderTest.java → ...eclipse/lyo/store/DatasetBuilderTest.java
diff --git a/...eclipse/lyo/store/JenaTdbStoreImplIT.java → ...eclipse/lyo/store/JenaTdbStoreImplIT.java b/...eclipse/lyo/store/JenaTdbStoreImplIT.java → ...eclipse/lyo/store/JenaTdbStoreImplIT.java
diff --git a/...se/lyo/store/JenaTdbStoreImplPathsIT.java → ...se/lyo/store/JenaTdbStoreImplPathsIT.java b/...se/lyo/store/JenaTdbStoreImplPathsIT.java → ...se/lyo/store/JenaTdbStoreImplPathsIT.java
diff --git a/...lipse/lyo/store/JenaTdbStoreImplTest.java → ...lipse/lyo/store/JenaTdbStoreImplTest.java b/...lipse/lyo/store/JenaTdbStoreImplTest.java → ...lipse/lyo/store/JenaTdbStoreImplTest.java
diff --git a/.../eclipse/lyo/store/SparqlStoreImplIT.java → .../eclipse/lyo/store/SparqlStoreImplIT.java b/.../eclipse/lyo/store/SparqlStoreImplIT.java → .../eclipse/lyo/store/SparqlStoreImplIT.java
diff --git a/...clipse/lyo/store/SparqlStoreImplTest.java → ...clipse/lyo/store/SparqlStoreImplTest.java b/...clipse/lyo/store/SparqlStoreImplTest.java → ...clipse/lyo/store/SparqlStoreImplTest.java
diff --git a/.../org/eclipse/lyo/store/StoreTestBase.java → .../org/eclipse/lyo/store/StoreTestBase.java b/.../org/eclipse/lyo/store/StoreTestBase.java → .../org/eclipse/lyo/store/StoreTestBase.java
diff --git a/...se/lyo/store/resources/BlankResource.java → ...se/lyo/store/resources/BlankResource.java b/...se/lyo/store/resources/BlankResource.java → ...se/lyo/store/resources/BlankResource.java
diff --git a/...e/lyo/store/resources/IBlankResource.java → ...e/lyo/store/resources/IBlankResource.java b/...e/lyo/store/resources/IBlankResource.java → ...e/lyo/store/resources/IBlankResource.java
diff --git a/...o/store/resources/IWithBlankResource.java → ...o/store/resources/IWithBlankResource.java b/...o/store/resources/IWithBlankResource.java → ...o/store/resources/IWithBlankResource.java
diff --git a/...resources/IWithTwoDepthBlankResource.java → ...resources/IWithTwoDepthBlankResource.java b/...resources/IWithTwoDepthBlankResource.java → ...resources/IWithTwoDepthBlankResource.java
diff --git a/.../store/resources/Nsp1DomainConstants.java → .../store/resources/Nsp1DomainConstants.java b/.../store/resources/Nsp1DomainConstants.java → .../store/resources/Nsp1DomainConstants.java
diff --git a/...ore/resources/Oslc_rmDomainConstants.java → ...ore/resources/Oslc_rmDomainConstants.java b/...ore/resources/Oslc_rmDomainConstants.java → ...ore/resources/Oslc_rmDomainConstants.java
diff --git a/...ipse/lyo/store/resources/Requirement.java → ...ipse/lyo/store/resources/Requirement.java b/...ipse/lyo/store/resources/Requirement.java → ...ipse/lyo/store/resources/Requirement.java
@@ -17,7 +17,7 @@
 import org.eclipse.lyo.oslc4j.core.model.Link;
 import org.eclipse.lyo.oslc4j.core.model.Occurs;
 import org.eclipse.lyo.oslc4j.core.model.ValueType;
-import org.eclipse.lyo.store.resources.Oslc_rmDomainConstants;
+import org.eclipse.lyo.store.resources.Oslc_rmDomainConstants;
 
 @OslcNamespace(Oslc_rmDomainConstants.REQUIREMENT_NAMESPACE)
 @OslcName(Oslc_rmDomainConstants.REQUIREMENT_LOCALNAME)

diff --git a/...yo/store/resources/WithBlankResource.java → ...yo/store/resources/WithBlankResource.java b/...yo/store/resources/WithBlankResource.java → ...yo/store/resources/WithBlankResource.java
diff --git a/.../resources/WithTwoDepthBlankResource.java → .../resources/WithTwoDepthBlankResource.java b/.../resources/WithTwoDepthBlankResource.java → .../resources/WithTwoDepthBlankResource.java
diff --git a/...-core/src/test/resources/log4j.properties → ...-core/src/test/resources/log4j.properties b/...-core/src/test/resources/log4j.properties → ...-core/src/test/resources/log4j.properties
diff --git a/...c/test/resources/resourceModel/domain.xml → ...c/test/resources/resourceModel/domain.xml b/...c/test/resources/resourceModel/domain.xml → ...c/test/resources/resourceModel/domain.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<oslc4j_ai:Specification xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:oslc4j_ai="http://org.eclipse.lyo/oslc4j/adaptorInterface">
-  <domainSpecifications name="TestDomain" namespaceURI="http://your.organisation.test/nsp1#" namespacePrefix="//@domainPrefixes.0">
-    <resources name="WithBlankResource" resourceProperties="//@domainSpecifications.0/@resourceProperties.0 //@domainSpecifications.0/@resourceProperties.1"/>
-    <resources name="BlankResource" resourceProperties="//@domainSpecifications.0/@resourceProperties.2"/>
-    <resources name="WithTwoDepthBlankResource" resourceProperties="//@domainSpecifications.0/@resourceProperties.3 //@domainSpecifications.0/@resourceProperties.1 //@domainSpecifications.0/@resourceProperties.2"/>
-    <resourceProperties name="relatesToBlankResource" valueType="LocalResource" range="//@domainSpecifications.0/@resources.1"/>
-    <resourceProperties name="stringProperty" valueType="String"/>
-    <resourceProperties name="intProperty" valueType="Integer"/>
-    <resourceProperties name="relatesToBlankResourceTwoDepth" valueType="LocalResource" range="//@domainSpecifications.0/@resources.0"/>
-  </domainSpecifications>
-  <domainPrefixes name="nsp1"/>
-  <generationSetting javaClassPackageName="org.eclipse.lyo.store.resources" javaFilesPath="\src\test\java"/>
-</oslc4j_ai:Specification>
+<?xml version="1.0" encoding="UTF-8"?>
+<oslc4j_ai:Specification xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:oslc4j_ai="http://org.eclipse.lyo/oslc4j/adaptorInterface">
+  <domainSpecifications name="TestDomain" namespaceURI="http://your.organisation.test/nsp1#" namespacePrefix="//@domainPrefixes.0">
+    <resources name="WithBlankResource" resourceProperties="//@domainSpecifications.0/@resourceProperties.0 //@domainSpecifications.0/@resourceProperties.1"/>
+    <resources name="BlankResource" resourceProperties="//@domainSpecifications.0/@resourceProperties.2"/>
+    <resources name="WithTwoDepthBlankResource" resourceProperties="//@domainSpecifications.0/@resourceProperties.3 //@domainSpecifications.0/@resourceProperties.1 //@domainSpecifications.0/@resourceProperties.2"/>
+    <resourceProperties name="relatesToBlankResource" valueType="LocalResource" range="//@domainSpecifications.0/@resources.1"/>
+    <resourceProperties name="stringProperty" valueType="String"/>
+    <resourceProperties name="intProperty" valueType="Integer"/>
+    <resourceProperties name="relatesToBlankResourceTwoDepth" valueType="LocalResource" range="//@domainSpecifications.0/@resources.0"/>
+  </domainSpecifications>
+  <domainPrefixes name="nsp1"/>
+  <generationSetting javaClassPackageName="org.eclipse.lyo.store.resources" javaFilesPath="\src\test\java"/>
+</oslc4j_ai:Specification>
diff --git a/...t/resources/triplestore.sample.properties → ...t/resources/triplestore.sample.properties b/...t/resources/triplestore.sample.properties → ...t/resources/triplestore.sample.properties