Skip to content

Commit

Permalink
Create modules to build in one go
Browse files Browse the repository at this point in the history
  • Loading branch information
@semanticfire
semanticfire committed Sep 29, 2021
1 parent 51306f0 commit 24e0b2f
Show file tree
Hide file tree
Showing 9 changed files with 190 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*/target/
**/target/
.project
.settings
.classpath
Expand Down
102 changes: 102 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<name>core</name>
<parent>
<groupId>com.zazuko.carml-service</groupId>
<artifactId>root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<slf4j.version>1.7.25</slf4j.version>
<rdf4j.version>3.4.0</rdf4j.version>
</properties>

<dependencies>

<dependency>
<groupId>com.taxonic.carml</groupId>
<artifactId>carml-engine</artifactId>
<version>0.3.2</version>
</dependency>
<dependency>
<groupId>com.taxonic.carml</groupId>
<artifactId>carml-logical-source-resolver-xpath</artifactId>
<version>0.3.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-ntriples</artifactId>
<version>${rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-nquads</artifactId>
<version>${rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-rdfxml</artifactId>
<version>${rdf4j.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-jsonld</artifactId>
<version>${rdf4j.version}</version>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.4.4</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.tomee/tomee-webapp -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.4.4</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1</version>
</dependency>

</dependencies>


</project>
8 changes: 2 additions & 6 deletions ...m/zazuko/service/carml/CarmlEndpoint.java → ...zuko/service/carml/CarmlEndpointCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
import java.io.ByteArrayInputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Optional;
import java.util.Set;

// import javax.enterprise.context.RequestScoped;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonWriter;
Expand All @@ -21,7 +19,6 @@

import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import org.eclipse.rdf4j.common.lang.FileFormat;
import org.eclipse.rdf4j.model.Model;
import org.eclipse.rdf4j.rio.RDFFormat;
import org.eclipse.rdf4j.rio.Rio;
Expand All @@ -32,9 +29,8 @@
import com.taxonic.carml.util.RmlMappingLoader;
import com.taxonic.carml.vocab.Rdf;

// @RequestScoped
@Path("/")
public class CarmlEndpoint {

public class CarmlEndpointCore {

@GET
@Produces(MediaType.TEXT_PLAIN)
Expand Down
25 changes: 25 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<name>zazuko-carml-service</name>

<groupId>com.zazuko.carml-service</groupId>
<artifactId>root</artifactId>
<version>1.0.0-SNAPSHOT</version>

<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<modules>
<module>core</module>
<module>war</module>
<module>service</module>
</modules>
</project>

30 changes: 24 additions & 6 deletions service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
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>
<name>zazuko-carml-service</name>

<groupId>com.zazuko</groupId>
<artifactId>carml-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>meecrowave</name>
<parent>
<groupId>com.zazuko.carml-service</groupId>
<artifactId>root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>meecrowave</artifactId>
<packaging>jar</packaging>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down Expand Up @@ -82,7 +86,12 @@
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>2.0.0</version>
</dependency>
</dependency>
<!-- <dependency>
<groupId>com.zazuko.carml-service</groupId>
<artifactId>core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency> -->
</dependencies>

<build>
Expand All @@ -91,6 +100,15 @@
<groupId>org.apache.meecrowave</groupId>
<artifactId>meecrowave-maven-plugin</artifactId>
<version>${meecrowave-maven-plugin.version}</version>
<executions>
<execution>
<id>bundle</id>
<phase>package</phase>
<goals>
<goal>bundle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/zazuko/service/carml/Server.java → ...ava/com/zazuko/service/server/Server.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zazuko.service.carml;
package com.zazuko.service.server;

import org.apache.meecrowave.Meecrowave;

Expand Down
2 changes: 1 addition & 1 deletion service/src/main/webapp/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<body>
<h1>File Upload </h1>

<form action="http://localhost:8080/" method="post" enctype="multipart/form-data">
<form action="http://localhost:8080/convert" method="post" enctype="multipart/form-data">

<p>
Select a mapping : <input type="file" name="mapping" />
Expand Down
58 changes: 33 additions & 25 deletions war/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
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>
<name>zazuko-carml-service</name>

<groupId>com.zazuko</groupId>
<artifactId>carml-service</artifactId>
<version>1.0.0-SNAPSHOT</version>
<name>war</name>
<parent>
<groupId>com.zazuko.carml-service</groupId>
<artifactId>root</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>war</artifactId>
<packaging>war</packaging>

<properties>
Expand Down Expand Up @@ -79,26 +81,32 @@
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.tomee/tomee-webapp -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.4.4</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1</version>
</dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.4.4</version>
</dependency>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>com.zazuko.carml-service</groupId>
<artifactId>core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>compiled</scope>
</dependency>
</dependencies>


</project>
8 changes: 1 addition & 7 deletions war/src/main/webapp/WEB-INF/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,16 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id="WebApp_ID" version="3.0">
<display-name>zazuko-carml-service</display-name>


<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
<init-param>
<param-name>jaxrs.serviceClasses</param-name>

<param-value>com.zazuko.service.carml.CarmlEndpoint</param-value>

<param-value>com.zazuko.service.carml.CarmlEndpointCore</param-value>
</init-param>
<init-param>
<param-name>jaxrs.address</param-name>

<param-value>/</param-value>

</init-param>
</servlet>
<servlet-mapping>
Expand Down

0 comments on commit 24e0b2f

Please sign in to comment.