Skip to content

Commit 34b1a5c

Browse files
cboehmecboehme
committed
Reorganised files and included schemata files from metafacture-core.
This commit makes changes to turn the files extracted from metafacture-core into a working project again.
1 parent 3d89635 commit 34b1a5c

File tree

80 files changed

+59
-126
lines changed

Some content is hidden

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

80 files changed

+59
-126
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
1+
# Ignore Maven target directory:
12
target/
3+
4+
# Ignore Eclipse project files:
5+
.classpath
6+
.project
7+
.settings/

‎pom.xml

Lines changed: 45 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.culturegraph</groupId>
4-
<artifactId>metafacture-core</artifactId>
5-
<version>2.0.0-SNAPSHOT</version>
6-
<name>metafacture.core</name>
7-
<description>Core package of the metafacture tool suite</description>
4+
<artifactId>metafacture-runner</artifactId>
5+
<version>0.0.0-SNAPSHOT</version>
6+
<name>metafacture.runner</name>
7+
<description>Standalone applications for working with Flux and Metamorph scripts</description>
88
<licenses>
99
<license>
1010
<name>Apache License, Version 2.0</name>
1111
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
1212
</license>
1313
</licenses>
14-
<url>http://github.com/culturegraph/metafacture-core</url>
14+
<url>http://github.com/culturegraph/metafacture-runner</url>
1515
<distributionManagement>
1616
<repository>
1717
<id>sonatype-nexus-staging</id>
@@ -61,34 +61,23 @@
6161
<properties>
6262
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6363
<targetJdk>1.6</targetJdk>
64-
<junit.version>4.11</junit.version>
65-
<antlr.version>3.4</antlr.version>
6664
</properties>
6765

6866
<scm>
69-
<connection>scm:git:git://github.com/culturegraph/metafacture-core.git</connection>
70-
<developerConnection>scm:git:[email protected]:culturegraph/metafacture-core.git</developerConnection>
71-
<url>http://github.com/culturegraph/metafacture-core</url>
67+
<connection>scm:git:git://github.com/culturegraph/metafacture-runner.git</connection>
68+
<developerConnection>scm:git:[email protected]:culturegraph/metafacture-runner.git</developerConnection>
69+
<url>http://github.com/culturegraph/metafacture-runner</url>
7270
<tag>HEAD</tag>
7371
</scm>
7472

7573
<build>
76-
<testResources>
77-
<testResource>
78-
<directory>${basedir}/src/test/java</directory>
79-
<excludes>
80-
<exclude>**/*.java</exclude>
81-
</excludes>
82-
</testResource>
83-
<testResource>
84-
<directory>${basedir}/src/test/resources</directory>
85-
</testResource>
86-
</testResources>
87-
8874
<resources>
8975
<resource>
90-
<directory>${basedir}/src/main/resources</directory>
76+
<directory>src/main/resources</directory>
9177
<filtering>true</filtering>
78+
<excludes>
79+
<exclude>assembly-resources/**/*</exclude>
80+
</excludes>
9281
</resource>
9382
</resources>
9483

@@ -116,7 +105,7 @@
116105
used to specify that all needed libraries are found under lib/ directory. -->
117106
<classpathPrefix>lib/</classpathPrefix>
118107
<!-- Specifies the main class of the application -->
119-
<mainClass>org.culturegraph.mf.Flux</mainClass>
108+
<mainClass>org.culturegraph.mf.cmdline.Flux</mainClass>
120109
</manifest>
121110
<manifestEntries>
122111
<git-commit>${buildNumber}</git-commit>
@@ -145,6 +134,28 @@
145134
</executions>
146135
</plugin>
147136

137+
<plugin>
138+
<artifactId>maven-dependency-plugin</artifactId>
139+
<version>2.8</version>
140+
<executions>
141+
<execution>
142+
<id>unpack-metafacture-core-resources</id>
143+
<phase>generate-resources</phase>
144+
<goals>
145+
<goal>unpack</goal>
146+
</goals>
147+
<configuration>
148+
<artifactItems>
149+
<artifactItem>
150+
<groupId>org.culturegraph</groupId>
151+
<artifactId>metafacture-core</artifactId>
152+
</artifactItem>
153+
</artifactItems>
154+
<includes>schemata/**/*</includes>
155+
</configuration>
156+
</execution>
157+
</executions>
158+
</plugin>
148159

149160
<plugin>
150161
<artifactId>maven-assembly-plugin</artifactId>
@@ -162,7 +173,7 @@
162173
</descriptors>
163174
<archive>
164175
<manifest>
165-
<mainClass>org.culturegraph.mf.Flux</mainClass>
176+
<mainClass>org.culturegraph.mf.cmdline.Flux</mainClass>
166177
<addClasspath>true</addClasspath>
167178
<classpathPrefix>lib/</classpathPrefix>
168179
</manifest>
@@ -175,27 +186,6 @@
175186
</executions>
176187
</plugin>
177188

178-
<plugin>
179-
<groupId>org.codehaus.mojo</groupId>
180-
<artifactId>build-helper-maven-plugin</artifactId>
181-
<version>1.4</version>
182-
<executions>
183-
<execution>
184-
<id>add-source</id>
185-
<phase>generate-sources</phase>
186-
<goals>
187-
<goal>add-source</goal>
188-
</goals>
189-
<configuration>
190-
<sources>
191-
<source>src/main/antlr3</source>
192-
</sources>
193-
</configuration>
194-
</execution>
195-
</executions>
196-
</plugin>
197-
198-
199189
<plugin>
200190
<groupId>org.apache.maven.plugins</groupId>
201191
<artifactId>maven-release-plugin</artifactId>
@@ -209,23 +199,11 @@
209199
</build>
210200

211201
<dependencies>
212-
213-
<dependency>
214-
<groupId>junit</groupId>
215-
<artifactId>junit</artifactId>
216-
<version>${junit.version}</version>
217-
</dependency>
218-
219-
<dependency>
220-
<groupId>commons-lang</groupId>
221-
<artifactId>commons-lang</artifactId>
222-
<version>2.6</version>
223-
</dependency>
224-
202+
225203
<dependency>
226-
<groupId>org.apache.commons</groupId>
227-
<artifactId>commons-compress</artifactId>
228-
<version>1.4</version>
204+
<groupId>org.culturegraph</groupId>
205+
<artifactId>metafacture-core</artifactId>
206+
<version>2.0.0-SNAPSHOT</version>
229207
</dependency>
230208

231209
<dependency>
@@ -235,63 +213,16 @@
235213
<scope>runtime</scope>
236214
</dependency>
237215

238-
<dependency>
239-
<groupId>org.slf4j</groupId>
240-
<artifactId>slf4j-api</artifactId>
241-
<version>1.7.2</version>
242-
</dependency>
243-
244-
<dependency>
245-
<groupId>mysql</groupId>
246-
<artifactId>mysql-connector-java</artifactId>
247-
<version>5.1.6</version>
248-
</dependency>
249-
250-
<dependency>
251-
<groupId>org.antlr</groupId>
252-
<artifactId>antlr-runtime</artifactId>
253-
<version>${antlr.version}</version>
254-
</dependency>
255216

256217
<dependency>
257-
<groupId>simple-jndi</groupId>
258-
<artifactId>simple-jndi</artifactId>
259-
<version>0.11.4.1</version>
260-
<scope>test</scope>
261-
</dependency>
262-
<dependency>
263-
<groupId>commons-io</groupId>
264-
<artifactId>commons-io</artifactId>
265-
<version>2.1</version>
266-
</dependency>
267-
<dependency>
268-
<groupId>org.jdom</groupId>
269-
<artifactId>jdom</artifactId>
270-
<version>1.1</version>
271-
</dependency>
272-
<dependency>
273-
<groupId>com.fasterxml.jackson.core</groupId>
274-
<artifactId>jackson-core</artifactId>
275-
<version>2.1.4</version>
276-
</dependency>
277-
<dependency>
278-
<groupId>org.mockito</groupId>
279-
<artifactId>mockito-core</artifactId>
280-
<version>1.9.5</version>
218+
<groupId>junit</groupId>
219+
<artifactId>junit</artifactId>
220+
<version>4.11</version>
281221
<scope>test</scope>
282-
<exclusions>
283-
<exclusion>
284-
<!-- Conflicts with the newer hamcrest version
285-
pulled in by junit -->
286-
<artifactId>hamcrest-core</artifactId>
287-
<groupId>org.hamcrest</groupId>
288-
</exclusion>
289-
</exclusions>
290222
</dependency>
291-
</dependencies>
292-
293-
294223

224+
225+
</dependencies>
295226

296227
<profiles>
297228
<profile>

‎src/main/assembly/assembly.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,34 +65,29 @@
6565
<lineEnding>crlf</lineEnding>
6666
</fileSet>
6767
<fileSet>
68-
<directory>examples/</directory>
69-
<outputDirectory>examples/</outputDirectory>
68+
<directory>${project.basedir}/src/main/resources/assembly-resources/</directory>
69+
<outputDirectory></outputDirectory>
7070
<includes>
7171
<include>**/*</include>
7272
</includes>
7373
<directoryMode>0755</directoryMode>
7474
<fileMode>0644</fileMode>
7575
</fileSet>
7676
<fileSet>
77-
<directory>${project.basedir}/src/main/resources/schemata/</directory>
77+
<directory>${project.build.directory}/dependency/schemata</directory>
7878
<outputDirectory>schemata/</outputDirectory>
7979
<includes>
8080
<include>*.xsd</include>
8181
</includes>
8282
<directoryMode>0755</directoryMode>
8383
<fileMode>0644</fileMode>
8484
</fileSet>
85-
<fileSet>
86-
<directory>modules/</directory>
87-
<outputDirectory>modules/</outputDirectory>
88-
<directoryMode>0755</directoryMode>
89-
<fileMode>0644</fileMode>
90-
</fileSet>
9185
<fileSet>
9286
<directory></directory>
9387
<outputDirectory></outputDirectory>
9488
<includes>
9589
<include>*.md</include>
90+
<include>LICENSE</include>
9691
</includes>
9792
<directoryMode>0755</directoryMode>
9893
<fileMode>0644</fileMode>

‎src/main/java/org/culturegraph/mf/Flux.java renamed to ‎src/main/java/org/culturegraph/mf/cmdline/Flux.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf;
16+
package org.culturegraph.mf.cmdline;
1717

1818
import java.io.File;
1919
import java.io.FilenameFilter;

‎src/main/java/org/culturegraph/mf/MorphVis.java renamed to ‎src/main/java/org/culturegraph/mf/cmdline/MorphVis.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf;
16+
package org.culturegraph.mf.cmdline;
1717

1818
import java.io.File;
1919
import java.io.FileOutputStream;

‎examples/beacon/combine/austriaforum.beacon renamed to ‎src/main/resources/assembly-resources/examples/beacon/combine/austriaforum.beacon

File renamed without changes.

‎examples/beacon/combine/biocist.beacon renamed to ‎src/main/resources/assembly-resources/examples/beacon/combine/biocist.beacon

File renamed without changes.

‎examples/beacon/combine/combine-beacon.flux renamed to ‎src/main/resources/assembly-resources/examples/beacon/combine/combine-beacon.flux

File renamed without changes.

‎examples/beacon/combine/oebl.beacon renamed to ‎src/main/resources/assembly-resources/examples/beacon/combine/oebl.beacon

File renamed without changes.

‎examples/beacon/combine/read-beacon.flux renamed to ‎src/main/resources/assembly-resources/examples/beacon/combine/read-beacon.flux

File renamed without changes.

0 commit comments

Comments
 (0)