Skip to content

Commit

Permalink
#429 - OSGi refactoring part 2.
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcanpilami
marcanpilami committed Jan 15, 2022
1 parent 27c2b22 commit a08de45
Show file tree
Hide file tree
Showing 332 changed files with 10,664 additions and 7,688 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ serious/JobBaseAPI/nullnull
/jqm-all/jqm-ws/src/main/webapp/dist/**
/jqm-all/jqm-ws/src/main/webapp/index.html
*dependency-reduced-pom.xml
**/sphinx/_build
**/tmp/
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,4 @@ jobs:
branches:
except:
- controller
- 429-feature-osgi
4 changes: 3 additions & 1 deletion .vscode/extensions.json
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"recommendations": [
"vscjava.vscode-java-pack",
"redhat.fabric8-analytics",
"ms-azuretools.vscode-docker",
"EditorConfig.editorconfig",
"ms-vscode.powershell",
"humao.rest-client",
"lextudio.restructuredtext",
"DotJoshJohnson.xml",
"ban.spellright",
"yycalm.linecount"
"yycalm.linecount",
"eg2.vscode-npm-script"
]
}
15 changes: 11 additions & 4 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"**/.settings": true,
"**/.factorypath": true
},

"LineCount.includes": [
"**/*.java",
"**/*.js",
Expand All @@ -31,8 +32,10 @@
"md": false,
"outdir": "jqm-all/jqm-service/target/count/"
},

"editor.formatOnSave": true,
"java.format.settings.url": "./jqm-all/jqm-doc/src/site/sphinx/files/format_eclipse_modified_java.xml",

"java.format.settings.url": "jqm-all/jqm-doc/src/site/sphinx/files/format_eclipse_modified_java.xml",
"java.configuration.updateBuildConfiguration": "automatic",
"java.import.exclusions": [
"**/.*",
Expand All @@ -48,24 +51,28 @@
"java.test.config": [
{
"name": "it",
"workingDirectory": "${workspaceFolder}/jqm-all/jqm-integration-tests"
"workingDirectory": "${workspaceFolder}/jqm-all/jqm-integration-tests",
"vmargs": [ "--add-opens", "java.naming/javax.naming.spi=ALL-UNNAMED" ],
},
{
"name": "web",
"workingDirectory": "${workspaceFolder}/jqm-all/jqm-integration-tests-ws"
}
],

"maven.excludedFolders": [
"**/.*", // exclude hidden folders
"**/node_modules", // exclude node modules to speed up
"**/target" // exclude duplicated pom file in target folder
],
"maven.executable.options": "",

"javascript.format.placeOpenBraceOnNewLineForFunctions": true,
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": true,
"restructuredtext.confPath": "${workspaceFolder}\\jqm-all\\jqm-doc\\src\\site\\sphinx",
"prettier.printWidth": 180,
"[javascript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
}
},

"restructuredtext.confPath": "${workspaceFolder}\\jqm-all\\jqm-doc\\src\\site\\sphinx",
}
86 changes: 4 additions & 82 deletions jqm-all/jqm-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,93 +20,15 @@
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<artifactId>shiro-crypto-hash</artifactId>
<version>${shiro.version}</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.core.version}</version>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>2.3.3</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>${osgi.annotation.version}</version>
<scope>provided</scope>
</dependency>

<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-wrap</artifactId>
<version>${pax.url.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${felix.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
115 changes: 0 additions & 115 deletions jqm-all/jqm-admin/src/test/java/com/enioka/admin/TestCrud.java
View file

This file was deleted.

36 changes: 19 additions & 17 deletions jqm-all/jqm-dbadapter/jqm-impl-db2/pom.xml → ...qm-api-client/jqm-api-client-core/pom.xml
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,42 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.enioka.jqm</groupId>
<artifactId>jqm-dbadapter</artifactId>
<artifactId>jqm-api-client</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>jqm-impl-db2</artifactId>
<packaging>jar</packaging>

<artifactId>jqm-api-client-core</artifactId>
<name>${project.groupId}:${project.artifactId}</name>
<url>http://jqm.readthedocs.org</url>
<description>The JQM data access layer</description>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
<groupId>com.enioka.jqm</groupId>
<artifactId>jqm-model</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.core.version}</version>
<scope>provided</scope>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-crypto-hash</artifactId>
<version>${shiro.version}</version>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>${osgi.annotation.version}</version>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.3</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.enioka.jqm</groupId>
<artifactId>jqm-model</artifactId>
<version>${project.version}</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

</dependencies>
</project>
10 changes: 5 additions & 5 deletions ...ioka/jqm/api/client/core/Deliverable.java → ...om/enioka/jqm/client/api/Deliverable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* limitations under the License.
*/

package com.enioka.jqm.api.client.core;
package com.enioka.jqm.client.api;

import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;

/**
* Represents a file created by a job instance
*
*
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
Expand All @@ -37,11 +37,11 @@ public class Deliverable

/**
* Construction. This will not create a new file on the file system!
*
*
* @param filePath
* @param fileName
*/
Deliverable(String filePath, String fileFamily, Integer id, String originalName)
public Deliverable(String filePath, String fileFamily, Integer id, String originalName)
{
this.filePath = filePath;
this.fileFamily = fileFamily;
Expand All @@ -66,7 +66,7 @@ public String getFilePath()

/**
* Optional file tag.
*
*
* @return the tag
*/
public String getFileFamily()
Expand Down

0 comments on commit a08de45

Please sign in to comment.