jatria-soft/ejson
1
0
Fork 0
Code Issues 1 Pull Requests Projects 1 Releases Wiki Activity

[FEAT] use Maven a build system root tool

Browse Source
This commit is contained in:
Edouard DUPIN 2024-06-07 09:26:18 +02:00
parent c6cb79c8d7
commit ec6a03835d
7 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="out/maven/classes" path="src">
<classpathentry including="**/*.java" kind="src" output="out/maven/classes" path="src">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -13,7 +13,7 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>

1
.project
View File

@ -36,7 +36,6 @@
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures>
<filteredResources>
<filter>

2
lutin_org-atriasoft-ejson.py
View File

@ -40,7 +40,7 @@ def configure(target, my_module):
'src/org/atriasoft/ejson/model/JsonBoolean.java',
'src/org/atriasoft/ejson/model/JsonString.java',
'src/org/atriasoft/ejson/model/JsonObject.java',
'src/org/atriasoft/ejson/internal/Log.java',
'src/org/atriasoft/ejson/internal/LOGGER.java',
'src/org/atriasoft/ejson/annotation/JsonManaged.java',
'src/org/atriasoft/ejson/annotation/EjsonAnnotation.java',
'src/org/atriasoft/ejson/annotation/JsonDefaultManaged.java',

19
pom.xml
View File

@ -1,41 +1,40 @@
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>jatria-soft</groupId>
<groupId>org.atriasoft</groupId>
<artifactId>ejson</artifactId>
<version>0.1.0</version>
<properties>
<maven.compiler.version>3.1</maven.compiler.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.version>3.13.0</maven.compiler.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<maven.dependency.version>3.1.1</maven.dependency.version>
</properties>
<repositories>
<repository>
<id>gitea</id>
<url>https://gitea.atria-soft.org/api/packages/jatria-soft/maven</url>
<url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>gitea</id>
<url>https://gitea.atria-soft.org/api/packages/jatria-soft/maven</url>
<url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
</repository>
<snapshotRepository>
<id>gitea</id>
<url>https://gitea.atria-soft.org/api/packages/jatria-soft/maven</url>
<url>https://gitea.atria-soft.org/api/packages/org.atriasoft/maven</url>
</snapshotRepository>
</distributionManagement>
<dependencies>
<dependency>
<groupId>jatria-soft</groupId>
<groupId>org.atriasoft</groupId>
<artifactId>etk</artifactId>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>jatria-soft</groupId>
<groupId>org.atriasoft</groupId>
<artifactId>aknot</artifactId>
<version>0.1.0</version>
</dependency>

1
src/module-info.java
View File

@ -12,7 +12,6 @@ open module org.atriasoft.ejson {
exports org.atriasoft.ejson.parser;
requires transitive org.atriasoft.etk;
requires transitive org.atriasoft.reggol;
requires java.base;
requires org.atriasoft.aknot;

6
src/org/atriasoft/ejson/parser/ParseJson.java
View File

@ -23,7 +23,7 @@ public class ParseJson {
boolean iParseArray(final Object parent, final String data, final PositionParsing pos, final FilePos filePos, final ParsingProperty parsingProperty) throws EjsonException, AknotException {
for (int iii = pos.value; iii < data.length(); iii++) {
//Log.verbose("parse Array: '{}'", data.charAt(iii));
//LOGGER.trace("parse Array: '{}'", data.charAt(iii));
filePos.check(data.charAt(iii));
if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
// white space == > nothing to do ...
@ -218,7 +218,7 @@ public class ParseJson {
boolean backslashPrevious = false;
final StringBuilder out = new StringBuilder();
for (int iii = pos.value + 1; iii < data.length(); iii++) {
//Log.verbose("parse String: '{}'", data.charAt(iii));
//LOGGER.trace("parse String: '{}'", data.charAt(iii));
filePos.check(data.charAt(iii));
if (data.charAt(iii) == '\\') {
if (backslashPrevious) {
@ -275,7 +275,7 @@ public class ParseJson {
startPos = pos.value;
}
for (int iii = startPos; iii < data.length(); iii++) {
//Log.verbose("parse Object: '{}'", data.charAt(iii));
//LOGGER.trace("parse Object: '{}'", data.charAt(iii));
filePos.check(data.charAt(iii));
if (data.charAt(iii) == ' ' || data.charAt(iii) == '\t' || data.charAt(iii) == '\n' || data.charAt(iii) == '\r') {
// white space == > nothing to do ...

2
test/src/test/atriasoft/ejson/generic/EjsonTestAll.java
View File

@ -214,7 +214,7 @@ public class EjsonTestAll {
"logLocation": "/usr/local/tomcat/logs/CofaxTools.log",
"logMaxSize": "",
"dataLog": 1,
"dataLogLocation": "/usr/local/tomcat/logs/dataLog.log",
"dataLogLocation": "/usr/local/tomcat/logs/dataLOGGER.log",
"dataLogMaxSize": "",
"removePageCache": "/content/admin/remove?cache=pages&id=",
"removeTemplateCache": "/content/admin/remove?cache=templates&id=",