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 b89dac9 Project cleanup.
b89dac9 is described below
commit b89dac9058b75c3c679f2d8cb16cbf2b19e3acd8
Author: JamesBognar <[email protected]>
AuthorDate: Fri Dec 7 10:20:20 2018 -0500
Project cleanup.
---
.../juneau-examples-rest-springboot/pom.xml | 2 +-
.../juneau/examples/rest/springboot/AppStart.java | 2 +-
.../juneau/microservice/console/ConfigCommand.java | 0
.../.classpath | 26 ------
.../juneau-microservice-server-springboot/.project | 23 -----
.../juneau-microservice-server-springboot/pom.xml | 102 ---------------------
.../microservice/console/Messages.properties | 42 ---------
juneau-microservice/pom.xml | 1 -
.../JuneauApplicationContextInitializer.java | 4 +-
.../rest/springboot}/ServletConfiguration.java | 4 +-
.../annotations/EnabledJuneauIntegration.java | 2 +-
11 files changed, 7 insertions(+), 201 deletions(-)
diff --git a/juneau-examples/juneau-examples-rest-springboot/pom.xml
b/juneau-examples/juneau-examples-rest-springboot/pom.xml
index 31547e0..57ac851 100644
--- a/juneau-examples/juneau-examples-rest-springboot/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.juneau</groupId>
- <artifactId>juneau-microservice-server-springboot</artifactId>
+ <artifactId>juneau-rest-server-springboot</artifactId>
<version>${project.version}</version>
</dependency>
diff --git
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/AppStart.java
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/AppStart.java
index 8abab75..073ad07 100644
---
a/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/AppStart.java
+++
b/juneau-examples/juneau-examples-rest-springboot/src/main/java/org/apache/juneau/examples/rest/springboot/AppStart.java
@@ -13,7 +13,7 @@
package org.apache.juneau.examples.rest.springboot;
import org.apache.juneau.examples.rest.RootResources;
-import
org.apache.juneau.microservice.springboot.annotations.EnabledJuneauIntegration;
+import org.apache.juneau.rest.springboot.annotations.*;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ConfigurableApplicationContext;
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
b/juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
similarity index 100%
rename from
juneau-microservice/juneau-microservice-server/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
rename to
juneau-microservice/juneau-microservice-core/src/main/java/org/apache/juneau/microservice/console/ConfigCommand.java
diff --git
a/juneau-microservice/juneau-microservice-server-springboot/.classpath
b/juneau-microservice/juneau-microservice-server-springboot/.classpath
deleted file mode 100644
index af1430b..0000000
--- a/juneau-microservice/juneau-microservice-server-springboot/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes"
path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con"
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/juneau-microservice/juneau-microservice-server-springboot/.project
b/juneau-microservice/juneau-microservice-server-springboot/.project
deleted file mode 100644
index 8f5d018..0000000
--- a/juneau-microservice/juneau-microservice-server-springboot/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>juneau-microservice-server-springboot</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/juneau-microservice/juneau-microservice-server-springboot/pom.xml
b/juneau-microservice/juneau-microservice-server-springboot/pom.xml
deleted file mode 100644
index ad31769..0000000
--- a/juneau-microservice/juneau-microservice-server-springboot/pom.xml
+++ /dev/null
@@ -1,102 +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-microservice</artifactId>
- <version>8.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>juneau-microservice-server-springboot</artifactId>
- <name>Apache Juneau Microservice Server - Spring Boot</name>
- <description>API for creating standalone executable jars that can be used
to start lightweight configurable REST
- interfaces.
- </description>
-
- <properties>
- <encoding>UTF-8</encoding>
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <!-- Skip javadoc generation since we generate them in the aggregate
pom -->
- <maven.javadoc.skip>true</maven.javadoc.skip>
-
- <!-- Java 8 required because Jetty requires it. -->
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <springframework.version>2.0.1.RELEASE</springframework.version>
- </properties>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.juneau</groupId>
- <artifactId>juneau-microservice-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Spring Boot dependencies-->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>${springframework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <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.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
-
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
-
<url>https://repository.apache.org/content/repositories/snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-</project>
diff --git
a/juneau-microservice/juneau-microservice-server/src/main/resources/org/apache/juneau/microservice/console/Messages.properties
b/juneau-microservice/juneau-microservice-server/src/main/resources/org/apache/juneau/microservice/console/Messages.properties
deleted file mode 100644
index 89b805f..0000000
---
a/juneau-microservice/juneau-microservice-server/src/main/resources/org/apache/juneau/microservice/console/Messages.properties
+++ /dev/null
@@ -1,42 +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. *
-//
***************************************************************************************************************************
-
-ExitCommand.info = Shut down service
-ExitCommand.description = Immediately shuts down the microservice and then the
JVM.
-
-RestartCommand.info = Restarts service
-RestartCommand.description = Immediately shuts down and then restarts the
microservice without restarting the JVM.
-
-HelpCommand.info = Commands help
-HelpCommand.description = \
- When called without arguments, prints the descriptions of all available
commands.\n\
- Can also be called with one or more arguments to get detailed
information on a command.
-HelpCommand.examples = \
- List all commands:\n\
- \t> help\n\
- \n\
- List help on the help command:\n\
- \t> help help\n
-HelpCommand.ListOfAvailableCommands = List of available commands:
-HelpCommand.NAME = NAME
-HelpCommand.SYNOPSIS = SYNOPSIS
-HelpCommand.DESCRIPTION = DESCRIPTION
-HelpCommand.EXAMPLES = EXAMPLES
-HelpCommand.CommandNotFound = Command not found.
-ConfigCommand.info = Get or set configuration
-ConfigCommand.description = Get configuration value for given key and set
(Restart required) for given key and value
-ConfigCommand.InvalidArguments = Invalid or missing arguments for config
command
-ConfigCommand.TooManyArguments = Too many arguments for config command
-ConfigCommand.KeyNotFound = key ''{0}'' is not found in current configuration
-ConfigCommand.ConfigSet = Configuration updated.
-ConfigCommand.ConfigRemove = key ''{0}'' was removed.
diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml
index d3ef1e0..edc2850 100644
--- a/juneau-microservice/pom.xml
+++ b/juneau-microservice/pom.xml
@@ -33,7 +33,6 @@
<module>juneau-microservice-jetty</module>
<module>juneau-microservice-jetty-template</module>
<module>juneau-microservice-test</module>
- <module>juneau-microservice-server-springboot</module>
</modules>
</project>
diff --git
a/juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/config/JuneauApplicationContextInitializer.java
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauApplicationContextInitializer.java
similarity index 93%
rename from
juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/config/JuneauApplicationContextInitializer.java
rename to
juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauApplicationContextInitializer.java
index 13f5f07..132e930 100644
---
a/juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/config/JuneauApplicationContextInitializer.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/JuneauApplicationContextInitializer.java
@@ -10,9 +10,9 @@
// * "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. *
//
***************************************************************************************************************************
-package org.apache.juneau.microservice.springboot.config;
+package org.apache.juneau.rest.springboot;
-import
org.apache.juneau.microservice.springboot.annotations.EnabledJuneauIntegration;
+import org.apache.juneau.rest.springboot.annotations.EnabledJuneauIntegration;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
diff --git
a/juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/config/ServletConfiguration.java
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/ServletConfiguration.java
similarity index 96%
rename from
juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/config/ServletConfiguration.java
rename to
juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/ServletConfiguration.java
index bacf649..b486bd8 100644
---
a/juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/config/ServletConfiguration.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/ServletConfiguration.java
@@ -10,11 +10,11 @@
// * "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. *
//
***************************************************************************************************************************
-package org.apache.juneau.microservice.springboot.config;
+package org.apache.juneau.rest.springboot;
-import
org.apache.juneau.microservice.springboot.annotations.EnabledJuneauIntegration;
import org.apache.juneau.rest.RestServlet;
import org.apache.juneau.rest.annotation.RestResource;
+import org.apache.juneau.rest.springboot.annotations.EnabledJuneauIntegration;
import org.springframework.beans.BeansException;
import
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
diff --git
a/juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/annotations/EnabledJuneauIntegration.java
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/annotations/EnabledJuneauIntegration.java
similarity index 96%
rename from
juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/annotations/EnabledJuneauIntegration.java
rename to
juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/annotations/EnabledJuneauIntegration.java
index 980b403..fb910ec 100644
---
a/juneau-microservice/juneau-microservice-server-springboot/src/main/java/org/apache/juneau/microservice/springboot/annotations/EnabledJuneauIntegration.java
+++
b/juneau-rest/juneau-rest-server-springboot/src/main/java/org/apache/juneau/rest/springboot/annotations/EnabledJuneauIntegration.java
@@ -10,7 +10,7 @@
// * "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. *
//
***************************************************************************************************************************
-package org.apache.juneau.microservice.springboot.annotations;
+package org.apache.juneau.rest.springboot.annotations;
import org.apache.juneau.rest.RestServlet;
import org.springframework.stereotype.Component;
