This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 9f456ff Project restructuring.
9f456ff is described below
commit 9f456ffb628f26859fd26992fe8b786c09d9e380
Author: JamesBognar <[email protected]>
AuthorDate: Fri Feb 5 14:03:13 2021 -0500
Project restructuring.
---
.../juneau-microservice-test.launch | 18 ---
juneau-rest/juneau-rest-client-utest/.gitignore | 6 -
juneau-rest/juneau-rest-client-utest/pom.xml | 121 -----------------
.../src/main/java/empty.txt | 0
juneau-rest/juneau-rest-mock-utest/.gitignore | 7 -
juneau-rest/juneau-rest-mock-utest/pom.xml | 129 ------------------
.../juneau-rest-mock-utest/src/main/java/empty.txt | 0
juneau-rest/juneau-rest-server-utest/.gitignore | 6 -
juneau-rest/juneau-rest-server-utest/pom.xml | 147 ---------------------
.../src/main/java/empty.txt | 0
.../juneau-rest-server-utest/xdocs/test2.txt | 13 --
.../xdocs/xsubdocs/test2.txt | 13 --
juneau-rest/pom.xml | 3 -
13 files changed, 463 deletions(-)
diff --git
a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
b/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
deleted file mode 100644
index 9ce36ac..0000000
---
a/juneau-microservice/juneau-microservice-test/juneau-microservice-test.launch
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/juneau-microservice-ftest"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN"
value="true"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS"
value="true"/>
-<booleanAttribute
key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER"
value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE"
value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
value="juneau-microservice-test.cfg"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="juneau-microservice-ftest"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER"
value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
diff --git a/juneau-rest/juneau-rest-client-utest/.gitignore
b/juneau-rest/juneau-rest-client-utest/.gitignore
deleted file mode 100644
index 34acf88..0000000
--- a/juneau-rest/juneau-rest-client-utest/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target/
-**/.DS_Store
-.classpath
-.project
-/.settings/
-/bin/
diff --git a/juneau-rest/juneau-rest-client-utest/pom.xml
b/juneau-rest/juneau-rest-client-utest/pom.xml
deleted file mode 100644
index 68bd6ef..0000000
--- a/juneau-rest/juneau-rest-client-utest/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-rest-client-utest</artifactId>
- <name>juneau/rest/rest-client-utest</name>
- <description>Apache Juneau REST Client Unit Tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-marshall</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-server-rdf</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-utest</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock-utest</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
-
<include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
-
<goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/juneau-rest/juneau-rest-client-utest/src/main/java/empty.txt
b/juneau-rest/juneau-rest-client-utest/src/main/java/empty.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/juneau-rest/juneau-rest-mock-utest/.gitignore
b/juneau-rest/juneau-rest-mock-utest/.gitignore
deleted file mode 100644
index 2536067..0000000
--- a/juneau-rest/juneau-rest-mock-utest/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/target/
-**/.DS_Store
-.classpath
-.project
-/.settings/
-/bin/
-
diff --git a/juneau-rest/juneau-rest-mock-utest/pom.xml
b/juneau-rest/juneau-rest-mock-utest/pom.xml
deleted file mode 100644
index 239355a..0000000
--- a/juneau-rest/juneau-rest-mock-utest/pom.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-rest-mock-utest</artifactId>
- <name>juneau/rest/rest-mock-utest</name>
- <description>Apache Juneau REST Mock Unit Tests</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-utest</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
-
<Automatic-Module-Name>org.apache.juneau.rest.mock.utest</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
-
<include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
-
<goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/juneau-rest/juneau-rest-mock-utest/src/main/java/empty.txt
b/juneau-rest/juneau-rest-mock-utest/src/main/java/empty.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/juneau-rest/juneau-rest-server-utest/.gitignore
b/juneau-rest/juneau-rest-server-utest/.gitignore
deleted file mode 100644
index 34acf88..0000000
--- a/juneau-rest/juneau-rest-server-utest/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target/
-**/.DS_Store
-.classpath
-.project
-/.settings/
-/bin/
diff --git a/juneau-rest/juneau-rest-server-utest/pom.xml
b/juneau-rest/juneau-rest-server-utest/pom.xml
deleted file mode 100644
index ed08aa0..0000000
--- a/juneau-rest/juneau-rest-server-utest/pom.xml
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-rest-server-utest</artifactId>
- <name>juneau/rest/rest-server-utest</name>
- <description>Apache Juneau REST Servlet Unit Tests</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-core-utest</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-rest-mock-utest</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <properties>
- <!-- Skip javadoc generation since we generate them in the
aggregate pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>verify</phase>
- <goals>
- <goal>jar-no-fork</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.2.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
-
<Automatic-Module-Name>org.apache.juneau.rest.server.utest</Automatic-Module-Name>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
-
<include>**/*Test.class</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.2</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
-
<goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/juneau-rest/juneau-rest-server-utest/src/main/java/empty.txt
b/juneau-rest/juneau-rest-server-utest/src/main/java/empty.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/juneau-rest/juneau-rest-server-utest/xdocs/test2.txt
b/juneau-rest/juneau-rest-server-utest/xdocs/test2.txt
deleted file mode 100644
index 6c94803..0000000
--- a/juneau-rest/juneau-rest-server-utest/xdocs/test2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
***************************************************************************************************************************
- * 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.
*
-
***************************************************************************************************************************
- OK-5
\ No newline at end of file
diff --git a/juneau-rest/juneau-rest-server-utest/xdocs/xsubdocs/test2.txt
b/juneau-rest/juneau-rest-server-utest/xdocs/xsubdocs/test2.txt
deleted file mode 100644
index 7bcf3d3..0000000
--- a/juneau-rest/juneau-rest-server-utest/xdocs/xsubdocs/test2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
***************************************************************************************************************************
- * 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.
*
-
***************************************************************************************************************************
- OK-6
\ No newline at end of file
diff --git a/juneau-rest/pom.xml b/juneau-rest/pom.xml
index d33fe3e..e632b57 100644
--- a/juneau-rest/pom.xml
+++ b/juneau-rest/pom.xml
@@ -35,9 +35,6 @@
<module>juneau-rest-server-springboot</module>
<module>juneau-rest-client</module>
<module>juneau-rest-mock</module>
- <module>juneau-rest-mock-utest</module>
- <module>juneau-rest-server-utest</module>
- <module>juneau-rest-client-utest</module>
</modules>
</project>
