You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2019/07/01 16:31:08 UTC
[juneau] branch master updated: Fix issues when loading workspace
from scratch in Eclipse.
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 c649d1e Fix issues when loading workspace from scratch in Eclipse.
c649d1e is described below
commit c649d1e89b79bed24d6d208e36bc863df08224a5
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Jul 1 12:29:36 2019 -0400
Fix issues when loading workspace from scratch in Eclipse.
---
.../apache/juneau/config/store/ConfigFileStore.java | 1 +
.../juneau-my-jetty-microservice/.project | 1 -
.../build-overlay/{pom.xml => pom2.xml} | 0
.../src/assembly/bin.xml | 10 +++++++++-
.../microservice/jetty/template/RootResources.java | 20 ++++++++++----------
.../juneau-my-springboot-microservice/.project | 1 -
.../build-overlay/{pom.xml => pom2.xml} | 0
.../src/assembly/bin.xml | 9 +++++++++
.../springboot/template/RootResources.java | 20 ++++++++++----------
9 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
index d3785d2..b22a631 100644
--- a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
+++ b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/store/ConfigFileStore.java
@@ -417,6 +417,7 @@ public class ConfigFileStore extends ConfigStore {
dir.toPath().register(watchService, kinds, modifier);
}
+ @SuppressWarnings("restriction")
private WatchEvent.Modifier lookupModifier(WatcherSensitivity s) {
try {
switch(s) {
diff --git a/juneau-microservice/juneau-my-jetty-microservice/.project b/juneau-microservice/juneau-my-jetty-microservice/.project
index adcd687..7f223d1 100755
--- a/juneau-microservice/juneau-my-jetty-microservice/.project
+++ b/juneau-microservice/juneau-my-jetty-microservice/.project
@@ -24,6 +24,5 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
</natures>
</projectDescription>
diff --git a/juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom.xml b/juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom2.xml
similarity index 100%
rename from juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom.xml
rename to juneau-microservice/juneau-my-jetty-microservice/build-overlay/pom2.xml
diff --git a/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml b/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
index 6077ee7..b6222a6 100644
--- a/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
+++ b/juneau-microservice/juneau-my-jetty-microservice/src/assembly/bin.xml
@@ -41,7 +41,15 @@
<directory>${basedir}/build-overlay</directory>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
+ <excludes><exclude>pom2.xml</exclude></excludes>
</fileSet>
</fileSets>
-
+ <files>
+ <file>
+ <source>${basedir}/build-overlay/pom2.xml</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>pom.xml</destName>
+ </file>
+ </files>
</assembly>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
index 87e1d3a..ab2ded9 100755
--- a/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
+++ b/juneau-microservice/juneau-my-jetty-microservice/src/main/java/org/apache/juneau/microservice/jetty/template/RootResources.java
@@ -12,11 +12,11 @@
// ***************************************************************************************************************************
package org.apache.juneau.microservice.jetty.template;
+import org.apache.juneau.html.annotation.HtmlDocConfig;
import org.apache.juneau.microservice.jetty.resources.DebugResource;
import org.apache.juneau.microservice.resources.ConfigResource;
import org.apache.juneau.microservice.resources.LogsResource;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.annotation.HtmlDoc;
import org.apache.juneau.rest.annotation.RestResource;
import org.apache.juneau.rest.widget.ContentTypeMenuItem;
import org.apache.juneau.rest.widget.ThemeMenuItem;
@@ -28,15 +28,6 @@ import org.apache.juneau.rest.widget.ThemeMenuItem;
path="/*",
title="My Microservice",
description="Top-level resources page",
- htmldoc=@HtmlDoc(
- widgets={
- ContentTypeMenuItem.class,
- ThemeMenuItem.class
- },
- navlinks={
- "options: servlet:/?method=OPTIONS"
- }
- ),
children={
HelloWorldResource.class,
ConfigResource.class,
@@ -44,6 +35,15 @@ import org.apache.juneau.rest.widget.ThemeMenuItem;
DebugResource.class
}
)
+@HtmlDocConfig(
+ widgets={
+ ContentTypeMenuItem.class,
+ ThemeMenuItem.class
+ },
+ navlinks={
+ "options: servlet:/?method=OPTIONS"
+ }
+)
public class RootResources extends BasicRestServletGroup {
private static final long serialVersionUID = 1L;
}
diff --git a/juneau-microservice/juneau-my-springboot-microservice/.project b/juneau-microservice/juneau-my-springboot-microservice/.project
index fc37613..c0be432 100755
--- a/juneau-microservice/juneau-my-springboot-microservice/.project
+++ b/juneau-microservice/juneau-my-springboot-microservice/.project
@@ -24,6 +24,5 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
</natures>
</projectDescription>
diff --git a/juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom.xml b/juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom2.xml
similarity index 100%
rename from juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom.xml
rename to juneau-microservice/juneau-my-springboot-microservice/build-overlay/pom2.xml
diff --git a/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml b/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
index c396055..14c41da 100644
--- a/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
+++ b/juneau-microservice/juneau-my-springboot-microservice/src/assembly/bin.xml
@@ -45,7 +45,16 @@
<directory>${basedir}/build-overlay</directory>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
+ <excludes><exclude>pom2.xml</exclude></excludes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>${basedir}/build-overlay/pom2.xml</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <destName>pom.xml</destName>
+ </file>
+ </files>
</assembly>
\ No newline at end of file
diff --git a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
index 60ea414..2f3ceaf 100755
--- a/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
+++ b/juneau-microservice/juneau-my-springboot-microservice/src/main/java/org/apache/juneau/microservice/springboot/template/RootResources.java
@@ -12,10 +12,10 @@
// ***************************************************************************************************************************
package org.apache.juneau.microservice.springboot.template;
+import org.apache.juneau.html.annotation.HtmlDocConfig;
import org.apache.juneau.microservice.resources.ConfigResource;
import org.apache.juneau.microservice.resources.LogsResource;
import org.apache.juneau.rest.*;
-import org.apache.juneau.rest.annotation.HtmlDoc;
import org.apache.juneau.rest.annotation.RestResource;
import org.apache.juneau.rest.widget.ContentTypeMenuItem;
import org.apache.juneau.rest.widget.ThemeMenuItem;
@@ -27,21 +27,21 @@ import org.apache.juneau.rest.widget.ThemeMenuItem;
path="/*",
title="My Microservice",
description="Top-level resources page",
- htmldoc=@HtmlDoc(
- widgets={
- ContentTypeMenuItem.class,
- ThemeMenuItem.class
- },
- navlinks={
- "options: servlet:/?method=OPTIONS"
- }
- ),
children={
HelloWorldResource.class,
ConfigResource.class,
LogsResource.class
}
)
+@HtmlDocConfig(
+ widgets={
+ ContentTypeMenuItem.class,
+ ThemeMenuItem.class
+ },
+ navlinks={
+ "options: servlet:/?method=OPTIONS"
+ }
+)
public class RootResources extends BasicRestServletGroup {
private static final long serialVersionUID = 1L;
}