summarization / pscapi

Commit 906b2145157936ee1c2729c91fd38cb0ef5bf9aa

Authored by Mateusz Kopeć
1 parent 3884340e
master

update package naming, log4j upgrade, deployment configuration

Inline Side-by-side
Showing 14 changed files with 47 additions and 26 deletions
1 1 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 3 <modelVersion>4.0.0</modelVersion>
4   - <groupId>mkopec.summ</groupId>
  4 + <groupId>pl.waw.ipipan.zil.summ</groupId>
5 5 <artifactId>pscapi</artifactId>
6   - <version>0.1-SNAPSHOT</version>
  6 + <version>1.0-SNAPSHOT</version>
7 7  
8 8 <properties>
9 9 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
... ... @@ -20,14 +20,14 @@
20 20  
21 21 <dependencies>
22 22 <dependency>
23   - <groupId>log4j</groupId>
24   - <artifactId>log4j</artifactId>
25   - <version>1.2.17</version>
  23 + <groupId>org.apache.logging.log4j</groupId>
  24 + <artifactId>log4j-core</artifactId>
  25 + <version>2.3</version>
26 26 </dependency>
27 27 <dependency>
28 28 <groupId>junit</groupId>
29 29 <artifactId>junit</artifactId>
30   - <version>4.8.1</version>
  30 + <version>4.12</version>
31 31 </dependency>
32 32 </dependencies>
33 33  
... ... @@ -44,4 +44,15 @@
44 44 </plugin>
45 45 </plugins>
46 46 </build>
  47 +
  48 + <distributionManagement>
  49 + <repository>
  50 + <id>deployment</id>
  51 + <url>http://maven.nlp.ipipan.waw.pl/content/repositories/releases/</url>
  52 + </repository>
  53 + <snapshotRepository>
  54 + <id>deployment</id>
  55 + <url>http://maven.nlp.ipipan.waw.pl/content/repositories/snapshots/</url>
  56 + </snapshotRepository>
  57 + </distributionManagement>
47 58 </project>
48 59 \ No newline at end of file
... ...
src/main/java/mkopec/summ/pscapi/io/PSC_IO.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/io/PSC_IO.java
  View file @906b214
1   -package mkopec.summ.pscapi.io;
  1 +package pl.waw.ipipan.zil.summ.pscapi.io;
2 2  
3 3 import java.io.File;
4 4 import java.io.IOException;
... ... @@ -8,13 +8,14 @@ import javax.xml.bind.JAXBException;
8 8 import javax.xml.bind.Marshaller;
9 9 import javax.xml.bind.Unmarshaller;
10 10  
11   -import org.apache.log4j.Logger;
  11 +import org.apache.logging.log4j.LogManager;
  12 +import org.apache.logging.log4j.Logger;
12 13  
13   -import mkopec.summ.pscapi.xml.Text;
  14 +import pl.waw.ipipan.zil.summ.pscapi.xml.Text;
14 15  
15 16 public class PSC_IO {
16 17  
17   - private final static Logger LOG = Logger.getLogger(PSC_IO.class);
  18 + private final static Logger LOG = LogManager.getLogger(PSC_IO.class);
18 19  
19 20 public static Text readText(String testFilePath) throws IOException, JAXBException {
20 21 return readText(new File(testFilePath));
... ...
src/main/java/mkopec/summ/pscapi/xml/Adapter1.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Adapter1.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.adapters.XmlAdapter;
12 12  
... ...
src/main/java/mkopec/summ/pscapi/xml/Adapter2.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Adapter2.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.adapters.XmlAdapter;
12 12  
... ...
src/main/java/mkopec/summ/pscapi/xml/ObjectFactory.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/ObjectFactory.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.XmlRegistry;
12 12  
... ...
src/main/java/mkopec/summ/pscapi/xml/Span.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Span.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.XmlAccessType;
12 12 import javax.xml.bind.annotation.XmlAccessorType;
... ...
src/main/java/mkopec/summ/pscapi/xml/SpanType.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/SpanType.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.XmlAccessType;
12 12 import javax.xml.bind.annotation.XmlAccessorType;
... ...
src/main/java/mkopec/summ/pscapi/xml/Spans.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Spans.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import java.util.ArrayList;
12 12 import java.util.List;
... ...
src/main/java/mkopec/summ/pscapi/xml/Summaries.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Summaries.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import java.util.ArrayList;
12 12 import java.util.List;
... ...
src/main/java/mkopec/summ/pscapi/xml/Summary.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Summary.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.XmlAccessType;
12 12 import javax.xml.bind.annotation.XmlAccessorType;
... ...
src/main/java/mkopec/summ/pscapi/xml/Text.java renamed to src/main/java/pl/waw/ipipan/zil/summ/pscapi/xml/Text.java
  View file @906b214
... ... @@ -6,7 +6,7 @@
6 6 //
7 7  
8 8  
9   -package mkopec.summ.pscapi.xml;
  9 +package pl.waw.ipipan.zil.summ.pscapi.xml;
10 10  
11 11 import javax.xml.bind.annotation.XmlAccessType;
12 12 import javax.xml.bind.annotation.XmlAccessorType;
... ...
src/main/resources/log4j.properties deleted
View file @3884340
1   -log4j.rootCategory=DEBUG, CONSOLE
2   -
3   -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
4   -log4j.appender.CONSOLE.Threshold=DEBUG
5   -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
6   -log4j.appender.CONSOLE.layout.ConversionPattern=[%-5p] %d{HH:mm:ss} %C{1}: %m%n
src/main/resources/log4j2.xml 0 → 100644
  View file @906b214
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<Configuration status="WARN">
  3 + <Appenders>
  4 + <Console name="Console" target="SYSTEM_OUT">
  5 + <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
  6 + </Console>
  7 + </Appenders>
  8 + <Loggers>
  9 + <Root level="error">
  10 + <AppenderRef ref="Console" />
  11 + </Root>
  12 + </Loggers>
  13 +</Configuration>
0 14 \ No newline at end of file
... ...
src/test/java/mkopec/summ/pscapi/io/ReadTest.java renamed to src/test/java/pl/waw/ipipan/zil/summ/pscapi/io/ReadTest.java
  View file @906b214
1   -package mkopec.summ.pscapi.io;
  1 +package pl.waw.ipipan.zil.summ.pscapi.io;
2 2  
3 3 import java.io.File;
4 4 import java.io.IOException;
... ... @@ -9,6 +9,8 @@ import org.junit.Rule;
9 9 import org.junit.Test;
10 10 import org.junit.rules.ExpectedException;
11 11  
  12 +import pl.waw.ipipan.zil.summ.pscapi.io.PSC_IO;
  13 +
12 14 public class ReadTest {
13 15  
14 16 @Rule
... ...