You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/12/11 06:08:36 UTC
[isis] branch master updated: ISIS-2473: tooling: renaming packages
and add new module 'java2adoc'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 9903cac ISIS-2473: tooling: renaming packages and add new module 'java2adoc'
9903cac is described below
commit 9903cac1de459e994a87cde45d58bb81b4691b4a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Dec 11 07:08:21 2020 +0100
ISIS-2473: tooling: renaming packages and add new module 'java2adoc'
---
.../apache/isis/tooling/cli/doclet/Adoclet.java | 6 +--
.../apache/isis/tooling/cli/doclet/Adoclets.java | 2 +-
.../apache/isis/tooling/cli/doclet/ToAsciiDoc.java | 2 +-
.../isis/tooling/cli/projdoc/ProjectDocModel.java | 2 +-
tooling/java2adoc/pom.xml | 45 ++++++++++++++++++++++
.../{ => ast}/ClassOrInterfaceDeclarations.java | 2 +-
.../tooling/javamodel/{ => ast}/CodeClasses.java | 2 +-
.../javamodel/{ => ast}/CompilationUnits.java | 2 +-
.../{ => ast}/ConstructorDeclarations.java | 2 +-
.../isis/tooling/javamodel/{ => ast}/Javadocs.java | 2 +-
.../tooling/javamodel/{ => ast}/MemberInfos.java | 2 +-
.../javamodel/{ => ast}/MethodDeclarations.java | 2 +-
.../isis/tooling/javamodel/test/AnalyzerTest.java | 4 +-
tooling/pom.xml | 1 +
14 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclet.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclet.java
index 35ca159..e59c71a 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclet.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclet.java
@@ -25,9 +25,9 @@ import com.github.javaparser.StaticJavaParser;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import org.apache.isis.commons.collections.Can;
-import org.apache.isis.tooling.javamodel.ClassOrInterfaceDeclarations;
-import org.apache.isis.tooling.javamodel.CompilationUnits;
-import org.apache.isis.tooling.javamodel.Javadocs;
+import org.apache.isis.tooling.javamodel.ast.ClassOrInterfaceDeclarations;
+import org.apache.isis.tooling.javamodel.ast.Javadocs;
+import org.apache.isis.tooling.javamodel.ast.CompilationUnits;
import org.apache.isis.tooling.model4adoc.AsciiDocFactory;
import org.apache.isis.tooling.model4adoc.AsciiDocWriter;
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclets.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclets.java
index 8f67f2c..dfdc156 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclets.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/Adoclets.java
@@ -22,7 +22,7 @@ import com.github.javaparser.ast.body.ConstructorDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
import com.github.javaparser.ast.body.TypeDeclaration;
-import org.apache.isis.tooling.javamodel.Javadocs;
+import org.apache.isis.tooling.javamodel.ast.Javadocs;
import lombok.NonNull;
import lombok.val;
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/ToAsciiDoc.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/ToAsciiDoc.java
index feda60b..2a19ff3 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/ToAsciiDoc.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/doclet/ToAsciiDoc.java
@@ -40,7 +40,7 @@ import org.jsoup.Jsoup;
import org.apache.isis.commons.collections.Can;
import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.tooling.javamodel.Javadocs;
+import org.apache.isis.tooling.javamodel.ast.Javadocs;
import org.apache.isis.tooling.model4adoc.AsciiDocFactory;
import org.apache.isis.tooling.model4adoc.AsciiDocWriter;
diff --git a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java
index 9ed0d47..07d9d4c 100644
--- a/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java
+++ b/tooling/cli/src/main/java/org/apache/isis/tooling/cli/projdoc/ProjectDocModel.java
@@ -44,7 +44,7 @@ import org.apache.isis.tooling.c4.C4;
import org.apache.isis.tooling.cli.CliConfig;
import org.apache.isis.tooling.cli.doclet.AdocletContext;
import org.apache.isis.tooling.javamodel.AnalyzerConfigFactory;
-import org.apache.isis.tooling.javamodel.CodeClasses;
+import org.apache.isis.tooling.javamodel.ast.CodeClasses;
import org.apache.isis.tooling.model4adoc.AsciiDocFactory;
import org.apache.isis.tooling.projectmodel.ArtifactCoordinates;
import org.apache.isis.tooling.projectmodel.Dependency;
diff --git a/tooling/java2adoc/pom.xml b/tooling/java2adoc/pom.xml
new file mode 100644
index 0000000..fbeeb4d
--- /dev/null
+++ b/tooling/java2adoc/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.tooling</groupId>
+ <artifactId>isis-tooling</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-tooling-java2adoc</artifactId>
+
+ <name>Apache Isis Tooling - Java to Asciidoc (Code Mining)</name>
+ <description>
+ Code mining library for Java source to Asciidoc conversion.
+ </description>
+
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.commons</groupId>
+ <artifactId>isis-commons</artifactId>
+ </dependency>
+
+ </dependencies>
+
+</project>
+
+
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ClassOrInterfaceDeclarations.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/ClassOrInterfaceDeclarations.java
similarity index 98%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ClassOrInterfaceDeclarations.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/ClassOrInterfaceDeclarations.java
index c97fcae..751dc6e 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ClassOrInterfaceDeclarations.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/ClassOrInterfaceDeclarations.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import java.util.stream.Stream;
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/CodeClasses.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/CodeClasses.java
similarity index 98%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/CodeClasses.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/CodeClasses.java
index cbc0429..2924a47 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/CodeClasses.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/CodeClasses.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import java.util.function.Predicate;
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/CompilationUnits.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/CompilationUnits.java
similarity index 97%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/CompilationUnits.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/CompilationUnits.java
index 017cfe0..7eb846d 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/CompilationUnits.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/CompilationUnits.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import java.io.File;
import java.util.function.Predicate;
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ConstructorDeclarations.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/ConstructorDeclarations.java
similarity index 97%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ConstructorDeclarations.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/ConstructorDeclarations.java
index db3d487..da43396 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ConstructorDeclarations.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/ConstructorDeclarations.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.ConstructorDeclaration;
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/Javadocs.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/Javadocs.java
similarity index 98%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/Javadocs.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/Javadocs.java
index e801cfb..472caa1 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/Javadocs.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/Javadocs.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import java.util.stream.Stream;
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/MemberInfos.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/MemberInfos.java
similarity index 97%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/MemberInfos.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/MemberInfos.java
index db123bf..1cedfb1 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/MemberInfos.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/MemberInfos.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import java.util.stream.Collectors;
import java.util.stream.Stream;
diff --git a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/MethodDeclarations.java b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/MethodDeclarations.java
similarity index 96%
rename from tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/MethodDeclarations.java
rename to tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/MethodDeclarations.java
index 6278f2d..ec028b0 100644
--- a/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/MethodDeclarations.java
+++ b/tooling/javamodel/src/main/java/org/apache/isis/tooling/javamodel/ast/MethodDeclarations.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.tooling.javamodel;
+package org.apache.isis.tooling.javamodel.ast;
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
import com.github.javaparser.ast.body.MethodDeclaration;
diff --git a/tooling/javamodel/src/test/java/org/apache/isis/tooling/javamodel/test/AnalyzerTest.java b/tooling/javamodel/src/test/java/org/apache/isis/tooling/javamodel/test/AnalyzerTest.java
index 4e5456e..aca1d2f 100644
--- a/tooling/javamodel/src/test/java/org/apache/isis/tooling/javamodel/test/AnalyzerTest.java
+++ b/tooling/javamodel/src/test/java/org/apache/isis/tooling/javamodel/test/AnalyzerTest.java
@@ -26,8 +26,8 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.commons.internal.base._Files;
import org.apache.isis.tooling.javamodel.AnalyzerConfigFactory;
-import org.apache.isis.tooling.javamodel.ClassOrInterfaceDeclarations;
-import org.apache.isis.tooling.javamodel.CompilationUnits;
+import org.apache.isis.tooling.javamodel.ast.ClassOrInterfaceDeclarations;
+import org.apache.isis.tooling.javamodel.ast.CompilationUnits;
import lombok.val;
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 3782e3c..2db6f2b 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -320,6 +320,7 @@
<module>model4adoc</module>
<module>javamodel</module>
<module>projectmodel</module>
+ <module>java2adoc</module>
<!-- depends on all the others -->
<module>cli</module>