Skip to content

Commit 2234874

Browse files
cboehmecboehme
committed
Rename package root and convert to multi-module project
The package root is changed from `org.culturegraph.mf` to `org.metafacture`. Additionally, the project is converted into a multi-module project that splits the former `metafacture-core` artifact into several smaller artifacts. This allows users of Metafacture to reduce the number of external dependencies pulled by Metafacture to the ones which are actually required. It also helps to minimize dependencies between Metafacture modules and makes the remaining dependencies more epxlicit.
1 parent 611f2f3 commit 2234874

File tree

579 files changed

+5432
-2156
lines changed

Some content is hidden

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

579 files changed

+5432
-2156
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Ignore Maven traget directory:
2-
/target/
1+
# Ignore temporary maven files:
2+
target/
33

44
# Ignore Eclipse project files:
55
.checkstyle

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ env:
99
- secure: "T9FcW2f0orue6i+Pvc1hE64mSoyOSwJFL9OrCBmhom5QW51Q8gP71DpEIz8fc6MvvU3wpSbTg5+lvbnTRdQCxmQzBeZb4yfdwUElldxaBqQaqVJWYBfoz0T1iznNA9WV3kHoHiDcb0iy3w/yzDxieQWjwj/69lKCvn8o425se7E="
1010

1111
after_success:
12-
- "[[ $TRAVIS_BRANCH == \"master\" ]] && { python travis-ci/configure-mvn.py ; mvn clean deploy --settings ~/.m2/mySettings.xml -Dgpg.skip=true -Psonatype-oss-release ; }"
12+
- "[[ $TRAVIS_BRANCH == \"master\" ]] && { python travis-ci/configure-mvn.py ; mvn clean deploy --settings ~/.m2/mySettings.xml -Dgpg.skip=true -P deploy ; }"

‎metafacture-biblio/pom.xml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2016 Christoph Böhme
4+
5+
Licensed under the Apache License, Version 2.0 the "License";
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<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">
18+
<modelVersion>4.0.0</modelVersion>
19+
20+
<parent>
21+
<groupId>org.metafacture</groupId>
22+
<artifactId>metafacture-core</artifactId>
23+
<version>5.0.0-SNAPSHOT</version>
24+
</parent>
25+
26+
<artifactId>metafacture-biblio</artifactId>
27+
28+
<name>Metafacture Biblio</name>
29+
<description>Modules for processing bibliographic data</description>
30+
31+
<scm>
32+
<connection>${project.parent.scm.connection}</connection>
33+
<developerConnection>${project.parent.scm.developerConnection}</developerConnection>
34+
<tag>${project.parent.scm.tag}</tag>
35+
<url>${project.parent.scm.url}</url>
36+
</scm>
37+
38+
<dependencies>
39+
<dependency>
40+
<groupId>org.metafacture</groupId>
41+
<artifactId>metafacture-framework</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>org.metafacture</groupId>
47+
<artifactId>metafacture-commons</artifactId>
48+
<version>${project.version}</version>
49+
</dependency>
50+
51+
<dependency>
52+
<groupId>org.metafacture</groupId>
53+
<artifactId>metafacture-flowcontrol</artifactId>
54+
<version>${project.version}</version>
55+
</dependency>
56+
57+
<dependency>
58+
<groupId>junit</groupId>
59+
<artifactId>junit</artifactId>
60+
<scope>test</scope>
61+
</dependency>
62+
63+
<dependency>
64+
<groupId>org.mockito</groupId>
65+
<artifactId>mockito-core</artifactId>
66+
<scope>test</scope>
67+
</dependency>
68+
</dependencies>
69+
</project>

‎src/main/java/org/culturegraph/mf/biblio/AlephMabXmlHandler.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/AlephMabXmlHandler.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License.
1414
*/
15-
package org.culturegraph.mf.biblio;
15+
package org.metafacture.biblio;
1616

17-
import org.culturegraph.mf.framework.FluxCommand;
18-
import org.culturegraph.mf.framework.StreamReceiver;
19-
import org.culturegraph.mf.framework.XmlReceiver;
20-
import org.culturegraph.mf.framework.annotations.Description;
21-
import org.culturegraph.mf.framework.annotations.In;
22-
import org.culturegraph.mf.framework.annotations.Out;
23-
import org.culturegraph.mf.framework.helpers.DefaultXmlPipe;
17+
import org.metafacture.framework.FluxCommand;
18+
import org.metafacture.framework.StreamReceiver;
19+
import org.metafacture.framework.XmlReceiver;
20+
import org.metafacture.framework.annotations.Description;
21+
import org.metafacture.framework.annotations.In;
22+
import org.metafacture.framework.annotations.Out;
23+
import org.metafacture.framework.helpers.DefaultXmlPipe;
2424
import org.xml.sax.Attributes;
2525
import org.xml.sax.SAXException;
2626

‎src/main/java/org/culturegraph/mf/biblio/AseqDecoder.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/AseqDecoder.java

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

18-
import org.culturegraph.mf.framework.FluxCommand;
19-
import org.culturegraph.mf.framework.StreamReceiver;
20-
import org.culturegraph.mf.framework.annotations.Description;
21-
import org.culturegraph.mf.framework.annotations.In;
22-
import org.culturegraph.mf.framework.annotations.Out;
23-
import org.culturegraph.mf.framework.helpers.DefaultObjectPipe;
18+
import org.metafacture.framework.FluxCommand;
19+
import org.metafacture.framework.StreamReceiver;
20+
import org.metafacture.framework.annotations.Description;
21+
import org.metafacture.framework.annotations.In;
22+
import org.metafacture.framework.annotations.Out;
23+
import org.metafacture.framework.helpers.DefaultObjectPipe;
2424

2525
/**
2626
* Parses a raw Aseq stream. UTF-8 encoding expected.

‎src/main/java/org/culturegraph/mf/biblio/ComarcXmlHandler.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/ComarcXmlHandler.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.biblio;
16+
package org.metafacture.biblio;
1717

1818
import java.util.ArrayList;
1919
import java.util.List;
2020

21-
import org.culturegraph.mf.framework.FluxCommand;
22-
import org.culturegraph.mf.framework.StreamReceiver;
23-
import org.culturegraph.mf.framework.XmlReceiver;
24-
import org.culturegraph.mf.framework.annotations.Description;
25-
import org.culturegraph.mf.framework.annotations.In;
26-
import org.culturegraph.mf.framework.annotations.Out;
27-
import org.culturegraph.mf.framework.helpers.DefaultXmlPipe;
21+
import org.metafacture.framework.FluxCommand;
22+
import org.metafacture.framework.StreamReceiver;
23+
import org.metafacture.framework.XmlReceiver;
24+
import org.metafacture.framework.annotations.Description;
25+
import org.metafacture.framework.annotations.In;
26+
import org.metafacture.framework.annotations.Out;
27+
import org.metafacture.framework.helpers.DefaultXmlPipe;
2828
import org.xml.sax.Attributes;
2929
import org.xml.sax.SAXException;
3030

‎src/main/java/org/culturegraph/mf/biblio/MabDecoder.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/MabDecoder.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.biblio;
16+
package org.metafacture.biblio;
1717

1818
import java.util.regex.Pattern;
1919

20-
import org.culturegraph.mf.framework.FluxCommand;
21-
import org.culturegraph.mf.framework.FormatException;
22-
import org.culturegraph.mf.framework.MissingIdException;
23-
import org.culturegraph.mf.framework.StreamReceiver;
24-
import org.culturegraph.mf.framework.annotations.Description;
25-
import org.culturegraph.mf.framework.annotations.In;
26-
import org.culturegraph.mf.framework.annotations.Out;
27-
import org.culturegraph.mf.framework.helpers.DefaultObjectPipe;
20+
import org.metafacture.framework.FluxCommand;
21+
import org.metafacture.framework.FormatException;
22+
import org.metafacture.framework.MissingIdException;
23+
import org.metafacture.framework.StreamReceiver;
24+
import org.metafacture.framework.annotations.Description;
25+
import org.metafacture.framework.annotations.In;
26+
import org.metafacture.framework.annotations.Out;
27+
import org.metafacture.framework.helpers.DefaultObjectPipe;
2828

2929

3030
/**

‎src/main/java/org/culturegraph/mf/biblio/iso2709/DirectoryBuilder.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/iso2709/DirectoryBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.biblio.iso2709;
16+
package org.metafacture.biblio.iso2709;
1717

18-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.FIELD_SEPARATOR;
19-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.MAX_PAYLOAD_LENGTH;
20-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.TAG_LENGTH;
18+
import static org.metafacture.biblio.iso2709.Iso2709Constants.FIELD_SEPARATOR;
19+
import static org.metafacture.biblio.iso2709.Iso2709Constants.MAX_PAYLOAD_LENGTH;
20+
import static org.metafacture.biblio.iso2709.Iso2709Constants.TAG_LENGTH;
2121

22-
import org.culturegraph.mf.framework.FormatException;
22+
import org.metafacture.framework.FormatException;
2323

2424
/**
2525
* Builds a directory in ISO2709:2008 format. For fields whose length is greater

‎src/main/java/org/culturegraph/mf/biblio/iso2709/DirectoryEntry.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/iso2709/DirectoryEntry.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.culturegraph.mf.biblio.iso2709;
16+
package org.metafacture.biblio.iso2709;
1717

18-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.MAX_BASE_ADDRESS;
19-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.MIN_BASE_ADDRESS;
20-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.RECORD_LABEL_LENGTH;
21-
import static org.culturegraph.mf.biblio.iso2709.Iso2709Constants.TAG_LENGTH;
18+
import static org.metafacture.biblio.iso2709.Iso2709Constants.MAX_BASE_ADDRESS;
19+
import static org.metafacture.biblio.iso2709.Iso2709Constants.MIN_BASE_ADDRESS;
20+
import static org.metafacture.biblio.iso2709.Iso2709Constants.RECORD_LABEL_LENGTH;
21+
import static org.metafacture.biblio.iso2709.Iso2709Constants.TAG_LENGTH;
2222

2323
/**
2424
* Provides access to a directory entry. A {@code DirectoryEntry} works like

‎src/main/java/org/culturegraph/mf/biblio/iso2709/FieldHandler.java renamed to ‎metafacture-biblio/src/main/java/org/metafacture/biblio/iso2709/FieldHandler.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.biblio.iso2709;
16+
package org.metafacture.biblio.iso2709;
1717

1818
/**
1919
* Callback interface defining the events emitted by

0 commit comments

Comments
 (0)