Skip to content

Commit 1d9f459

Browse files
author
James Leigh
authored
Merge pull request #1 from jamesrdf/issues/#915-split-project
Fix #915 split project
2 parents 4a51d7f + 94c82b0 commit 1d9f459

File tree

6,635 files changed

+388
-522255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,635 files changed

+388
-522255
lines changed

‎README.md‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
# Welcome to the RDF4J code repository
1+
# Welcome to the RDF4J Server and Console repository
22

3-
[![Build Status](https://travis-ci.org/eclipse/rdf4j.svg?branch=master)](https://travis-ci.org/eclipse/rdf4j)
3+
[![Build Status](https://travis-ci.org/eclipse/rdf4j-tools.svg?branch=master)](https://travis-ci.org/eclipse/rdf4j-tools)
44

5-
This is the main code repository for the Eclipse RDF4J project. Please see
6-
[RDF4J.org](http://rdf4j.org) for detailed information about RDF4J, including
5+
This is the Server and Console code repository for the Eclipse RDF4J project.
6+
7+
Please see [RDF4J.org](http://rdf4j.org) for detailed information about RDF4J, including
78
user documentation and [downloads of the latest release](http://rdf4j.org/download).
89

910
[![Visit our IRC channel](https://kiwiirc.com/buttons/irc.freenode.net/rdf4j.png)](https://kiwiirc.com/client/irc.freenode.net/?nick=rdf4j-user|?#rdf4j)
@@ -16,7 +17,7 @@ guidelines](https://github.com/eclipse/rdf4j/blob/master/.github/CONTRIBUTING.md
1617
The short version:
1718

1819
1. Digitally sign the [Eclipse Contributor Agreement (ECA)](https://www.eclipse.org/legal/ECA.php). You can do this by logging into the [Eclipse projects forge](http://www.eclipse.org/contribute/cla); click on "Eclipse Contributor Agreement"; and Complete the form. Be sure to use the same email address when you register for the account that you intend to use on Git commit records. See the [ECA FAQ](https://www.eclipse.org/legal/ecafaq.php) for more info.
19-
2. Create an issue in the [RDF4J GitHub issue tracker](https://github.com/eclipse/rdf4j/issues) that describes your improvement, new feature, or bug fix.
20+
2. Create an issue in the [RDF4J GitHub issue tracker](https://github.com/eclipse/rdf4j-tools/issues) that describes your improvement, new feature, or bug fix.
2021
3. Fork the GitHub repository.
2122
4. Create a new branch (starting from master) for your issue.
2223
5. Make your changes on this branch. Apply the [RDF4J code formatting guidelines](https://github.com/eclipse/rdf4j/blob/master/.github/CONTRIBUTING.md#code-formatting). Don't forget to include unit tests.

‎assembly/pom.xml‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,193 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<parent>
6+
<groupId>org.eclipse.rdf4j</groupId>
7+
<artifactId>rdf4j-tools</artifactId>
8+
<version>2.3-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>rdf4j-assembly</artifactId>
12+
<packaging>pom</packaging>
13+
14+
<name>RDF4J: Assembly</name>
15+
<description>Distribution bundle assembly</description>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.eclipse.rdf4j</groupId>
20+
<artifactId>rdf4j-console</artifactId>
21+
<version>${project.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.eclipse.rdf4j</groupId>
25+
<artifactId>rdf4j-runtime-osgi</artifactId>
26+
<version>${project.version}</version>
27+
<exclusions>
28+
<exclusion>
29+
<groupId>org.eclipse.rdf4j</groupId>
30+
<artifactId>rdf4j-http-server-spring</artifactId>
31+
</exclusion>
32+
</exclusions>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.eclipse.rdf4j</groupId>
36+
<artifactId>rdf4j-runtime</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>org.eclipse.rdf4j</groupId>
41+
<artifactId>rdf4j-config</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.eclipse.rdf4j</groupId>
46+
<artifactId>rdf4j-client</artifactId>
47+
<version>${project.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.eclipse.rdf4j</groupId>
51+
<artifactId>rdf4j-storage</artifactId>
52+
<version>${project.version}</version>
53+
</dependency>
54+
</dependencies>
55+
56+
<build>
57+
<plugins>
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-javadoc-plugin</artifactId>
61+
<configuration>
62+
<encoding>utf8</encoding>
63+
<source>1.8</source>
64+
<quiet>true</quiet>
65+
<additionalparam>${javadoc.opts}</additionalparam>
66+
<includeDependencySources>true</includeDependencySources>
67+
<dependencySourceIncludes>
68+
<dependencySourceIncludes>org.eclipse.rdf4j:*</dependencySourceIncludes>
69+
</dependencySourceIncludes>
70+
</configuration>
71+
<executions>
72+
<execution>
73+
<id>create-aggregate-javadoc</id>
74+
<inherited>false</inherited>
75+
<phase>package</phase>
76+
<goals>
77+
<goal>aggregate</goal>
78+
</goals>
79+
80+
<configuration>
81+
<doctitle>RDF4J ${project.version} API</doctitle>
82+
<windowtitle>RDF4J ${project.version} API</windowtitle>
83+
<groups>
84+
<group>
85+
<title>Repository API</title>
86+
<packages>org.eclipse.rdf4j.repository*</packages>
87+
</group>
88+
<group>
89+
<title>RDF Model API</title>
90+
<packages>org.eclipse.rdf4j.model*</packages>
91+
</group>
92+
93+
<group>
94+
<title>Storage And Inference Layer (SAIL) API</title>
95+
<packages>org.eclipse.rdf4j.sail*</packages>
96+
</group>
97+
<group>
98+
<title>Rio: RDF Parsers and Writers </title>
99+
<packages>org.eclipse.rdf4j.rio*</packages>
100+
</group>
101+
102+
<group>
103+
<title>Query API and query engines</title>
104+
<packages>org.eclipse.rdf4j.query:org.eclipse.rdf4j.query.impl:org.eclipse.rdf4j.query.algebra*:org.eclipse.rdf4j.query.parser*</packages>
105+
106+
</group>
107+
<group>
108+
<title>Query Result Parsers and Writers</title>
109+
<packages>org.eclipse.rdf4j.query.resultio*</packages>
110+
</group>
111+
112+
<group>
113+
<title>RDF4J Web Client</title>
114+
<packages>org.eclipse.rdf4j.http.webclient*</packages>
115+
</group>
116+
117+
<group>
118+
<title>HTTP Protocol for Client/Server Communication</title>
119+
<packages>org.eclipse.rdf4j.http*</packages>
120+
</group>
121+
</groups>
122+
123+
<links>
124+
<link>http://docs.oracle.com/javase/8/docs/api/</link>
125+
</links>
126+
</configuration>
127+
</execution>
128+
</executions>
129+
</plugin>
130+
<plugin>
131+
<artifactId>maven-assembly-plugin</artifactId>
132+
<configuration>
133+
<finalName>eclipse-rdf4j-${project.version}</finalName>
134+
<attach>false</attach>
135+
<descriptors>
136+
<descriptor>src/main/assembly/sdk.xml</descriptor>
137+
</descriptors>
138+
</configuration>
139+
<executions>
140+
<execution>
141+
<id>create-sdk</id>
142+
<phase>package</phase>
143+
<goals>
144+
<goal>single</goal>
145+
</goals>
146+
</execution>
147+
</executions>
148+
</plugin>
149+
<plugin>
150+
<groupId>org.apache.maven.plugins</groupId>
151+
<artifactId>maven-shade-plugin</artifactId>
152+
<configuration>
153+
<artifactSet>
154+
<includes>
155+
<include>org.eclipse.rdf4j:*</include>
156+
</includes>
157+
<excludes>
158+
<exclude>org.eclipse.rdf4j:rdf4j-runtime-osgi</exclude>
159+
</excludes>
160+
</artifactSet>
161+
<outputFile>target/eclipse-rdf4j-${project.version}-onejar.jar</outputFile>
162+
<createDependencyReducedPom>false</createDependencyReducedPom>
163+
<shadedArtifactAttached>false</shadedArtifactAttached>
164+
<transformers>
165+
<transformer
166+
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
167+
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
168+
<resource>edl-v1.0.txt</resource>
169+
<file>../edl-v1.0.txt</file>
170+
</transformer>
171+
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
172+
<resource>notice.md</resource>
173+
<file>../notice.md</file>
174+
</transformer>
175+
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
176+
<resource>about.md</resource>
177+
<file>../about.md</file>
178+
</transformer>
179+
</transformers>
180+
</configuration>
181+
<executions>
182+
<execution>
183+
<id>create-onejar</id>
184+
<phase>package</phase>
185+
<goals>
186+
<goal>shade</goal>
187+
</goals>
188+
</execution>
189+
</executions>
190+
</plugin>
191+
</plugins>
192+
</build>
193+
</project>

‎core/assembly/src/main/assembly/sdk.xml‎ renamed to ‎assembly/src/main/assembly/sdk.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
</fileSet>
2626

2727
<fileSet>
28-
<directory>../target/apidocs</directory>
28+
<directory>target/site/apidocs</directory>
2929
<outputDirectory>docs/apidocs</outputDirectory>
3030
</fileSet>
3131

3232
</fileSets>
3333

3434
<files>
3535
<file>
36-
<source>../http/server/target/rdf4j-server.war</source>
36+
<source>../server/target/rdf4j-server.war</source>
3737
<outputDirectory>war</outputDirectory>
3838
</file>
3939
<file>
40-
<source>../http/workbench/target/rdf4j-workbench.war</source>
40+
<source>../workbench/target/rdf4j-workbench.war</source>
4141
<outputDirectory>war</outputDirectory>
4242
</file>
4343

@@ -55,15 +55,15 @@
5555
<filtered>true</filtered>
5656
</file>
5757
<file>
58-
<source>../../edl-v1.0.txt</source>
58+
<source>../edl-v1.0.txt</source>
5959
<outputDirectory/>
6060
</file>
6161
<file>
62-
<source>../../about.md</source>
62+
<source>../about.md</source>
6363
<outputDirectory/>
6464
</file>
6565
<file>
66-
<source>../../notice.md</source>
66+
<source>../notice.md</source>
6767
<outputDirectory/>
6868
</file>
6969
</files>

‎core/assembly/src/main/dist/bin/console.bat‎ renamed to ‎assembly/src/main/dist/bin/console.bat‎

File renamed without changes.

‎core/assembly/src/main/dist/bin/console.sh‎ renamed to ‎assembly/src/main/dist/bin/console.sh‎

File renamed without changes.

‎benchmark/pom.xml‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

‎benchmark/runBenchmarks.sh‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎benchmark/src/main/java/org/eclipse/rdf4j/benchmark/ForwardChainingRDFSInferencerBenchmark.java‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)