Skip to content

Commit f1dadea

Browse files
amartinezcsucamartinezcsuc
committed
Merge branch 'release/1.4.2'
2 parents 2f458e5 + a3da959 commit f1dadea

97 files changed

Lines changed: 203 additions & 214 deletions

File tree

Some content is hidden

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

analyse-core/pom.xml renamed to analyse/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<version>1.3.2</version>
12-
<artifactId>analyse-core</artifactId>
12+
<artifactId>analyse</artifactId>
1313
<packaging>jar</packaging>
1414

1515
<name>Analyse</name>
@@ -79,7 +79,7 @@
7979
</dependency>
8080
<dependency>
8181
<groupId>org.csuc</groupId>
82-
<artifactId>binding-core</artifactId>
82+
<artifactId>binding</artifactId>
8383
<version>1.3</version>
8484
</dependency>
8585
<!-- https://mvnrepository.com/artifact/args4j/args4j -->
@@ -118,7 +118,7 @@
118118
<archive>
119119
<manifest>
120120
<addClasspath>true</addClasspath>
121-
<mainClass>org.csuc.analyse.core.cli.App</mainClass>
121+
<mainClass>org.csuc.analyse.cli.App</mainClass>
122122
</manifest>
123123
</archive>
124124
<finalName>${project.name}-${project.version}</finalName>

analyse-core/src/main/java/org/csuc/analyse/core/cli/App.java renamed to analyse/src/main/java/org/csuc/analyse/cli/App.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
/**
22
*
33
*/
4-
package org.csuc.analyse.core.cli;
4+
package org.csuc.analyse.cli;
55

66
import org.apache.hadoop.fs.Path;
77
import org.apache.logging.log4j.Level;
88
import org.apache.logging.log4j.LogManager;
99
import org.apache.logging.log4j.Logger;
1010
import org.apache.logging.log4j.io.IoBuilder;
11-
import org.csuc.analyse.core.factory.*;
12-
import org.csuc.analyse.core.strategy.dom.Dom;
13-
import org.csuc.analyse.core.strategy.dom4j.Dom4j;
14-
import org.csuc.analyse.core.strategy.sax.Sax;
15-
import org.csuc.analyse.core.strategy.xslt.Xslt;
16-
import org.csuc.analyse.core.util.EnumTypes;
17-
import org.csuc.analyse.core.util.FormatType;
18-
import org.csuc.analyse.core.util.MethodType;
19-
import org.csuc.analyse.core.util.TimeUtils;
11+
import org.csuc.analyse.factory.*;
12+
import org.csuc.analyse.strategy.dom.Dom;
13+
import org.csuc.analyse.strategy.dom4j.Dom4j;
14+
import org.csuc.analyse.strategy.sax.Sax;
15+
import org.csuc.analyse.strategy.xslt.Xslt;
16+
import org.csuc.analyse.util.EnumTypes;
17+
import org.csuc.analyse.util.FormatType;
18+
import org.csuc.analyse.util.MethodType;
19+
import org.csuc.analyse.util.TimeUtils;
2020
import org.csuc.core.HDFS;
2121
import org.kohsuke.args4j.CmdLineException;
2222
import org.kohsuke.args4j.CmdLineParser;
2323

2424
import javax.xml.parsers.ParserConfigurationException;
2525
import javax.xml.transform.TransformerException;
26-
import java.io.File;
2726
import java.io.FileOutputStream;
2827
import java.io.IOException;
2928
import java.net.URISyntaxException;

analyse-core/src/main/java/org/csuc/analyse/core/cli/ArgsBean.java renamed to analyse/src/main/java/org/csuc/analyse/cli/ArgsBean.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.csuc.analyse.core.cli;
1+
package org.csuc.analyse.cli;
22

33
import org.apache.commons.io.FileExistsException;
44
import org.apache.logging.log4j.LogManager;
55
import org.apache.logging.log4j.Logger;
6-
import org.csuc.analyse.core.util.EnumTypes;
7-
import org.csuc.analyse.core.util.FormatType;
8-
import org.csuc.analyse.core.util.MethodType;
6+
import org.csuc.analyse.util.EnumTypes;
7+
import org.csuc.analyse.util.FormatType;
8+
import org.csuc.analyse.util.MethodType;
99
import org.csuc.typesafe.HDFSConfig;
1010
import org.kohsuke.args4j.CmdLineException;
1111
import org.kohsuke.args4j.CmdLineParser;

analyse-core/src/main/java/org/csuc/analyse/core/factory/FactoryParser.java renamed to analyse/src/main/java/org/csuc/analyse/factory/FactoryParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.csuc.analyse.core.factory;
1+
package org.csuc.analyse.factory;
22

33
/**
44
* @author amartinez

analyse-core/src/main/java/org/csuc/analyse/core/factory/Parser.java renamed to analyse/src/main/java/org/csuc/analyse/factory/Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.csuc.analyse.core.factory;
1+
package org.csuc.analyse.factory;
22

33
import org.apache.hadoop.fs.FileSystem;
44
import org.apache.hadoop.fs.Path;

analyse-core/src/main/java/org/csuc/analyse/core/factory/ParserFILE.java renamed to analyse/src/main/java/org/csuc/analyse/factory/ParserFILE.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.csuc.analyse.core.factory;
1+
package org.csuc.analyse.factory;
22

33
import org.apache.hadoop.fs.FileSystem;
44
import org.apache.logging.log4j.LogManager;
55
import org.apache.logging.log4j.Logger;
6-
import org.csuc.analyse.core.strategy.ParserMethod;
6+
import org.csuc.analyse.strategy.ParserMethod;
77

88
import java.io.IOException;
99
import java.io.OutputStream;

analyse-core/src/main/java/org/csuc/analyse/core/factory/ParserOAI.java renamed to analyse/src/main/java/org/csuc/analyse/factory/ParserOAI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.csuc.analyse.core.factory;
1+
package org.csuc.analyse.factory;
22

33
import org.apache.hadoop.fs.FileSystem;
44
import org.apache.logging.log4j.LogManager;
55
import org.apache.logging.log4j.Logger;
6-
import org.csuc.analyse.core.strategy.ParserMethod;
6+
import org.csuc.analyse.strategy.ParserMethod;
77
import org.csuc.deserialize.JaxbUnmarshal;
88
import org.openarchives.oai._2.OAIPMHtype;
99

analyse-core/src/main/java/org/csuc/analyse/core/factory/ParserURL.java renamed to analyse/src/main/java/org/csuc/analyse/factory/ParserURL.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.csuc.analyse.core.factory;
1+
package org.csuc.analyse.factory;
22

33
import org.apache.hadoop.fs.FileSystem;
44
import org.apache.logging.log4j.LogManager;
55
import org.apache.logging.log4j.Logger;
6-
import org.csuc.analyse.core.strategy.ParserMethod;
6+
import org.csuc.analyse.strategy.ParserMethod;
77

88
import java.io.IOException;
99
import java.io.OutputStream;

analyse-core/src/main/java/org/csuc/analyse/core/strategy/ParserMethod.java renamed to analyse/src/main/java/org/csuc/analyse/strategy/ParserMethod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.csuc.analyse.core.strategy;
1+
package org.csuc.analyse.strategy;
22

33
import org.apache.hadoop.fs.FileSystem;
44
import org.apache.hadoop.fs.Path;

analyse-core/src/main/java/org/csuc/analyse/core/strategy/dom/Dom.java renamed to analyse/src/main/java/org/csuc/analyse/strategy/dom/Dom.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package org.csuc.analyse.core.strategy.dom;
1+
package org.csuc.analyse.strategy.dom;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.fasterxml.jackson.databind.SerializationFeature;
55
import org.apache.hadoop.fs.FileSystem;
66
import org.apache.hadoop.fs.Path;
77
import org.apache.logging.log4j.LogManager;
88
import org.apache.logging.log4j.Logger;
9-
import org.csuc.analyse.core.strategy.ParserMethod;
10-
import org.csuc.analyse.core.util.xml.Result;
9+
import org.csuc.analyse.strategy.ParserMethod;
10+
import org.csuc.analyse.util.xml.Result;
11+
import org.csuc.analyse.util.xml.Namespace;
1112
import org.csuc.core.HDFS;
1213
import org.w3c.dom.*;
1314
import org.w3c.dom.traversal.DocumentTraversal;
@@ -154,7 +155,7 @@ private String getXPath(Node node){
154155
private Result createObject(){
155156
Result result = new Result();
156157
values.forEach((String xpath, String value) -> {
157-
org.csuc.analyse.core.util.xml.Node node = new org.csuc.analyse.core.util.xml.Node();
158+
org.csuc.analyse.util.xml.Node node = new org.csuc.analyse.util.xml.Node();
158159

159160
Integer c = count.get(xpath).get();
160161
node.setCount(c);
@@ -165,7 +166,7 @@ private Result createObject(){
165166
});
166167

167168
namespace.forEach((String uri, String prefix)->{
168-
org.csuc.analyse.core.util.xml.Namespace namespace = new org.csuc.analyse.core.util.xml.Namespace();
169+
Namespace namespace = new Namespace();
169170

170171
namespace.setUri(uri);
171172
namespace.setPrefix(prefix);

0 commit comments

Comments
 (0)