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
commit 0d827b6c89825260aa7a754b8d343e2785c4560e
Author: JamesBognar <james.bog...@salesforce.com>
AuthorDate: Wed Jun 22 07:43:05 2022 -0400
Javadocs
---
.../juneau-apply-prefs.sh => juneau-apply-prefs.sh | 0
.../juneau-build-all.sh => juneau-build-all.sh | 2 +-
...eau-build-javadoc.sh => juneau-build-javadoc.sh | 2 +-
launches/juneau-build.sh => juneau-build.sh | 2 +-
.../juneau/dto/{openapi => openapi3}/Contact.java | 7 +-
.../dto/{openapi => openapi3}/Discriminator.java | 3 +-
.../juneau/dto/{openapi => openapi3}/Encoding.java | 12 +-
.../juneau/dto/{openapi => openapi3}/Example.java | 17 +--
.../ExternalDocumentation.java | 3 +-
.../dto/{openapi => openapi3}/HeaderInfo.java | 37 +----
.../juneau/dto/{openapi => openapi3}/Info.java | 8 +-
.../juneau/dto/{openapi => openapi3}/Items.java | 152 +--------------------
.../juneau/dto/{openapi => openapi3}/License.java | 7 +-
.../juneau/dto/{openapi => openapi3}/Link.java | 17 +--
.../dto/{openapi => openapi3}/MediaType.java | 2 +-
.../dto/{openapi => openapi3}/OAuthFlow.java | 7 +-
.../dto/{openapi => openapi3}/OAuthFlows.java | 7 +-
.../dto/{openapi => openapi3}/OpenApiElement.java | 7 +-
.../dto/{openapi => openapi3}/RequestBodyInfo.java | 7 +-
.../juneau/dto/{openapi => openapi3}/Response.java | 2 +-
.../dto/{openapi => openapi3}/SchemaInfo.java | 28 +---
.../{openapi => openapi3}/SecuritySchemeInfo.java | 39 +-----
.../juneau/dto/{openapi => openapi3}/Server.java | 2 +-
.../dto/{openapi => openapi3}/ServerVariable.java | 32 +----
.../juneau/dto/{openapi => openapi3}/Tag.java | 10 +-
.../juneau/dto/{openapi => openapi3}/Xml.java | 2 +-
.../dto/{openapi => openapi3}/package-info.java | 2 +-
...eate-workspace.sh => juneau-create-workspace.sh | 2 +-
juneau-doc/docs/ReleaseNotes/9.0.0.html | 77 ++++++++---
juneau-doc/docs/Topics/01.Overview.html | 4 +-
juneau-doc/docs/overview_template.html | 8 +-
launches/juneau-env.sh => juneau-env.sh | 0
.../juneau/examples/core/dto/DtoExample.java | 1 -
.../juneau/examples/core/dto/atom/AtomFeed.java | 1 -
.../examples/core/dto/atom/AtomHtmlExample.java | 1 -
.../examples/core/dto/atom/AtomJsonExample.java | 1 -
.../examples/core/dto/atom/AtomXmlExample.java | 1 -
.../examples/core/html/HtmlComplexExample.java | 1 -
.../examples/core/html/HtmlSimpleExample.java | 1 -
.../examples/core/json/JsonComplexExample.java | 1 -
.../core/json/JsonConfigurationExample.java | 1 -
.../examples/core/json/JsonSimpleExample.java | 1 -
.../juneau/examples/core/oapi/OapiExample.java | 1 -
.../org/apache/juneau/examples/core/pojo/Pojo.java | 1 -
.../juneau/examples/core/pojo/PojoComplex.java | 1 -
.../examples/core/rdf/RdfComplexExample.java | 1 -
.../juneau/examples/core/rdf/RdfExample.java | 1 -
.../juneau/examples/core/svl/SvlExample.java | 1 -
.../examples/core/uon/UonComplexExample.java | 1 -
.../juneau/examples/core/uon/UonExample.java | 1 -
.../examples/core/xml/XmlComplexExample.java | 1 -
.../examples/core/xml/XmlConfigurationExample.java | 1 -
.../juneau/examples/core/xml/XmlSimpleExample.java | 1 -
.../apache/juneau/examples/rest/AdminGuard.java | 1 -
.../juneau/examples/rest/HelloWorldResource.java | 1 -
.../juneau/examples/rest/RequestEchoResource.java | 1 -
.../apache/juneau/examples/rest/RootResources.java | 1 -
.../juneau/examples/rest/command/EchoCommand.java | 1 -
.../juneau/examples/rest/dto/AtomFeedResource.java | 1 -
.../juneau/examples/rest/dto/DtoExamples.java | 1 -
.../examples/rest/dto/JsonSchemaResource.java | 1 -
...uneau-open-javadoc.sh => juneau-open-javadoc.sh | 2 +-
launches/juneau-open-javadoc.launch | 12 +-
.../juneau-release.launch | 0
64 files changed, 102 insertions(+), 448 deletions(-)
diff --git a/launches/juneau-apply-prefs.sh b/juneau-apply-prefs.sh
similarity index 100%
rename from launches/juneau-apply-prefs.sh
rename to juneau-apply-prefs.sh
diff --git a/launches/juneau-build-all.sh b/juneau-build-all.sh
similarity index 98%
rename from launches/juneau-build-all.sh
rename to juneau-build-all.sh
index 82e64dab8..2f6758276 100755
--- a/launches/juneau-build-all.sh
+++ b/juneau-build-all.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License.
*
#
***************************************************************************************************************************
-. launches/juneau-env.sh
+. juneau-env.sh
mvn clean install
. juneau-build-javadoc.sh
diff --git a/launches/juneau-build-javadoc.sh b/juneau-build-javadoc.sh
similarity index 98%
rename from launches/juneau-build-javadoc.sh
rename to juneau-build-javadoc.sh
index ea939a796..9c96b0d5a 100755
--- a/launches/juneau-build-javadoc.sh
+++ b/juneau-build-javadoc.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License.
*
#
***************************************************************************************************************************
-. launches/juneau-env.sh
+. juneau-env.sh
cd juneau-doc
mvn install
diff --git a/launches/juneau-build.sh b/juneau-build.sh
similarity index 98%
rename from launches/juneau-build.sh
rename to juneau-build.sh
index 675fcefc7..84793a340 100755
--- a/launches/juneau-build.sh
+++ b/juneau-build.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License.
*
#
***************************************************************************************************************************
-. launches/juneau-env.sh
+. juneau-env.sh
mvn clean install
echo
'*******************************************************************************'
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Contact.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Contact.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Contact.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Contact.java
index ca1053165..f63331c12 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Contact.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Contact.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -46,11 +46,6 @@ import java.util.Set;
* <js>"email"</js>: <js>"supp...@swagger.io"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="name,url,email,*")
@FluentSetters
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Discriminator.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Discriminator.java
similarity index 98%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Discriminator.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Discriminator.java
index 0459b39c1..3fe02b878 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Discriminator.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Discriminator.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -83,7 +83,6 @@ public class Discriminator extends OpenApiElement {
*
* @param value
* The new value for this property.
- * <br>{@doc GFM} can be used for rich text representation.
* <br>Can be <jk>null</jk> to unset the property.
* @return This object
*/
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Encoding.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Encoding.java
similarity index 96%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Encoding.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Encoding.java
index 0ce9f74d4..63c2da068 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Encoding.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Encoding.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -184,11 +184,6 @@ public class Encoding extends OpenApiElement{
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Property value is required.
@@ -218,11 +213,6 @@ public class Encoding extends OpenApiElement{
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Property value is required.
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Example.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Example.java
similarity index 95%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Example.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Example.java
index ed3c1d5e0..e9134bdaf 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Example.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Example.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -43,11 +43,6 @@ import java.util.Set;
* <js>"email"</js>: <js>"supp...@swagger.io"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="summary,description,externalValue,value,*")
@FluentSetters
@@ -177,11 +172,6 @@ public class Example extends OpenApiElement {
* (Note: <js>"value"</js> has no meaning for required parameters.)
* Unlike JSON Schema this value MUST conform to the defined
<code>type</code> for this parameter.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Object getValue() {
@@ -197,11 +187,6 @@ public class Example extends OpenApiElement {
* (Note: <js>"default"</js> has no meaning for required parameters.)
* Unlike JSON Schema this value MUST conform to the defined
<code>type</code> for this parameter.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param val The new value for this property.
* @return This object
*/
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/ExternalDocumentation.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ExternalDocumentation.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/ExternalDocumentation.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ExternalDocumentation.java
index ab75e083e..92ca4ff71 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/ExternalDocumentation.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ExternalDocumentation.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -79,7 +79,6 @@ public class ExternalDocumentation extends OpenApiElement {
*
* @param value
* The new value for this property.
- * <br>{@doc GFM} can be used for rich text representation.
* <br>Can be <jk>null</jk> to unset the property.
* @return This object
*/
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/HeaderInfo.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.java
similarity index 93%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/HeaderInfo.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.java
index 3d5d18465..7f614169f 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/HeaderInfo.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/HeaderInfo.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -43,11 +43,6 @@ import java.util.*;
* <js>"type"</js>: <js>"integer"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="description,explode,deprecated,allowEmptyValue,allowReserved,schema,example,examples,$ref,*")
@SuppressWarnings({"unchecked"})
@@ -159,11 +154,6 @@ public class HeaderInfo extends OpenApiElement {
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Property value is required.
@@ -200,15 +190,8 @@ public class HeaderInfo extends OpenApiElement {
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
- * <br>Property value is required.
- * </ul>
* @return This object
*/
public HeaderInfo setExplode(Boolean value) {
@@ -234,12 +217,8 @@ public class HeaderInfo extends OpenApiElement {
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
+ * The new value for this property.
* @return This object
*/
public HeaderInfo setDeprecated(Boolean value) {
@@ -265,12 +244,8 @@ public class HeaderInfo extends OpenApiElement {
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
+ * The new value for this property.
* @return This object
*/
public HeaderInfo setAllowEmptyValue(Boolean value) {
@@ -296,12 +271,8 @@ public class HeaderInfo extends OpenApiElement {
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
+ * The new value for this property.
* @return This object
*/
public HeaderInfo setAllowReserved(Boolean value) {
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Info.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Info.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Info.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Info.java
index 6f4b5263d..8b47d74de 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Info.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Info.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -67,11 +67,6 @@ import java.util.Set;
* <js>"version"</js>: <js>"1.0.1"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="title,description,version,contact,license,termsOfService,*")
@FluentSetters
@@ -163,7 +158,6 @@ public class Info extends OpenApiElement {
*
* @param value
* The new value for this property.
- * <br>{@doc GFM} can be used for rich text representation.
* <br>Can be <jk>null</jk> to unset the property.
* @return This object
*/
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Items.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.java
similarity index 86%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Items.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.java
index dc8f34b1d..d52259d5b 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Items.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Items.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -51,11 +51,6 @@ import static org.apache.juneau.internal.CollectionUtils.*;
* <js>"minLength"</js>: 2
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="type,format,items,collectionFormat,default,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,enum,multipleOf,$ref,*")
@FluentSetters
@@ -154,11 +149,6 @@ public class Items extends OpenApiElement {
* <p>
* The internal type of the array.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Valid values:
@@ -187,11 +177,6 @@ public class Items extends OpenApiElement {
* <p>
* The extending format for the previously mentioned <code>type</code>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc SwaggerDataTypeFormats}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getFormat() {
@@ -204,11 +189,6 @@ public class Items extends OpenApiElement {
* <p>
* The extending format for the previously mentioned <code>type</code>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc SwaggerDataTypeFormats}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -302,11 +282,6 @@ public class Items extends OpenApiElement {
* Unlike JSON Schema this value MUST conform to the
defined <code>type</code> for the data type.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Object getDefault() {
@@ -327,11 +302,6 @@ public class Items extends OpenApiElement {
* Unlike JSON Schema this value MUST conform to the
defined <code>type</code> for the data type.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -345,11 +315,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>maximum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Number getMaximum() {
@@ -359,11 +324,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>maximum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -377,11 +337,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>exclusiveMaximum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Boolean getExclusiveMaximum() {
@@ -391,11 +346,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>exclusiveMaximum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -409,11 +359,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>minimum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Number getMinimum() {
@@ -423,11 +368,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>minimum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -441,11 +381,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>exclusiveMinimum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Boolean getExclusiveMinimum() {
@@ -455,11 +390,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>exclusiveMinimum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -473,11 +403,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>maxLength</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Integer getMaxLength() {
@@ -487,11 +412,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>maxLength</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -505,11 +425,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>minLength</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Integer getMinLength() {
@@ -519,11 +434,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>minLength</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -537,11 +447,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>pattern</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getPattern() {
@@ -554,11 +459,6 @@ public class Items extends OpenApiElement {
* <p>
* This string SHOULD be a valid regular expression.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -572,11 +472,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>maxItems</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Integer getMaxItems() {
@@ -586,11 +481,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>maxItems</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -604,11 +494,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>minItems</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Integer getMinItems() {
@@ -618,11 +503,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>minItems</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -636,11 +516,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>uniqueItems</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Boolean getUniqueItems() {
@@ -650,11 +525,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>uniqueItems</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -668,11 +538,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>enum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public List<Object> getEnum() {
@@ -682,11 +547,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>enum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -741,11 +601,6 @@ public class Items extends OpenApiElement {
/**
* Bean property getter: <property>multipleOf</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Number getMultipleOf() {
@@ -755,11 +610,6 @@ public class Items extends OpenApiElement {
/**
* Bean property setter: <property>multipleOf</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/License.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/License.java
similarity index 96%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/License.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/License.java
index 28858e530..0dbc5f9f7 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/License.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/License.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -44,11 +44,6 @@ import java.util.Set;
* <js>"url"</js>:
<js>"http://www.apache.org/licenses/LICENSE-2.0.html";</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="name,url,*")
@FluentSetters
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Link.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Link.java
similarity index 96%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Link.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Link.java
index 637f4f836..aabcf7484 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Link.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Link.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -45,11 +45,6 @@ import java.util.Set;
* <js>"email"</js>: <js>"supp...@swagger.io"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="operationRef,operationId,description,requestBody,server,parameters,*")
@FluentSetters
@@ -188,11 +183,6 @@ public class Link extends OpenApiElement {
* (Note: <js>"value"</js> has no meaning for required parameters.)
* Unlike JSON Schema this value MUST conform to the defined
<code>type</code> for this parameter.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public Object getRequestBody() {
@@ -208,11 +198,6 @@ public class Link extends OpenApiElement {
* (Note: <js>"default"</js> has no meaning for required parameters.)
* Unlike JSON Schema this value MUST conform to the defined
<code>type</code> for this parameter.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param val The new value for this property.
* @return This object
*/
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/MediaType.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/MediaType.java
similarity index 99%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/MediaType.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/MediaType.java
index 036956f3b..189c65607 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/MediaType.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/MediaType.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OAuthFlow.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OAuthFlow.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OAuthFlow.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OAuthFlow.java
index 93cb31f0e..76410340a 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OAuthFlow.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OAuthFlow.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -45,11 +45,6 @@ import java.util.Set;
* <js>"email"</js>: <js>"supp...@swagger.io"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="authorizationUrl,tokenUrl,refreshUrl,scopes,*")
@FluentSetters
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OAuthFlows.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OAuthFlows.java
similarity index 98%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OAuthFlows.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OAuthFlows.java
index 3c7204cbf..484aa4ace 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OAuthFlows.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OAuthFlows.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -83,11 +83,6 @@ import static org.apache.juneau.internal.CollectionUtils.*;
* <js>"name"</js>: <js>"foo"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="implicit,password,clientCredentials,authorizationCode,*")
@FluentSetters
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OpenApiElement.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OpenApiElement.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.java
index c18627496..91a2a8bc7 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/OpenApiElement.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/OpenApiElement.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.CollectionUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -27,11 +27,6 @@ import java.util.Set;
/**
* Root class for all Swagger beans.
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@FluentSetters
public abstract class OpenApiElement {
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/RequestBodyInfo.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/RequestBodyInfo.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/RequestBodyInfo.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/RequestBodyInfo.java
index 6da55a312..c7368e9dd 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/RequestBodyInfo.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/RequestBodyInfo.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -159,11 +159,6 @@ public class RequestBodyInfo extends OpenApiElement{
* <p>
* The type of the object.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Property value is required.
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Response.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Response.java
similarity index 99%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Response.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Response.java
index c317d2cc5..3aab01488 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Response.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Response.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/SchemaInfo.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.java
similarity index 98%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/SchemaInfo.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.java
index 8478f6dc9..6ec79d6c2 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/SchemaInfo.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SchemaInfo.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -56,11 +56,6 @@ import java.util.*;
* <js>"title"</js>: <js>"foo"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="format,title,description,default,multipleOf,maximum,exclusiveMaximum,minimum,exclusiveMinimum,maxLength,minLength,pattern,maxItems,minItems,uniqueItems,maxProperties,minProperties,required,enum,type,items,allOf,anyOf,oneOf,properties,additionalProperties,not,discriminator,readOnly,writeOnly,nullable,deprecated,xml,externalDocs,example,$ref,*")
@FluentSetters
@@ -181,11 +176,6 @@ public class SchemaInfo extends OpenApiElement {
/**
* Bean property getter: <property>format</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc SwaggerDataTypeFormats}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getFormat() {
@@ -195,11 +185,6 @@ public class SchemaInfo extends OpenApiElement {
/**
* Bean property setter: <property>format</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -258,7 +243,6 @@ public class SchemaInfo extends OpenApiElement {
*
* @param value
* The new value for this property.
- * <br>{@doc GFM} can be used for rich text representation.
* <br>Can be <jk>null</jk> to unset the property.
* @return This object
*/
@@ -677,11 +661,6 @@ public class SchemaInfo extends OpenApiElement {
/**
* Bean property setter: <property>enum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -732,11 +711,6 @@ public class SchemaInfo extends OpenApiElement {
/**
* Bean property setter: <property>type</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/SecuritySchemeInfo.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SecuritySchemeInfo.java
similarity index 93%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/SecuritySchemeInfo.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SecuritySchemeInfo.java
index a5e2206ae..c5a651c00 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/SecuritySchemeInfo.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/SecuritySchemeInfo.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.ConverterUtils.*;
@@ -86,11 +86,6 @@ import static org.apache.juneau.internal.CollectionUtils.*;
* <js>"name"</js>: <js>"foo"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="in,name,type,description,scheme,bearerFormat,flows,*")
@FluentSetters
@@ -161,16 +156,11 @@ public class SecuritySchemeInfo extends OpenApiElement {
* Parameter names are case sensitive.
* <li>
* If <code>in</code> is <js>"path"</js>, the
<code>name</code> field MUST correspond to the associated path segment
- * from the <code>path</code> field in the {@doc
SwaggerPathsObject Paths Object}.
+ * from the <code>path</code> field in the paths object.
* <li>
* For all other cases, the name corresponds to the
parameter name used based on the <code>in</code> property.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc SwaggerPathTemplating Path Templating}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getName() {
@@ -189,16 +179,11 @@ public class SecuritySchemeInfo extends OpenApiElement {
* Parameter names are case sensitive.
* <li>
* If <code>in</code> is <js>"path"</js>, the
<code>name</code> field MUST correspond to the associated path segment
- * from the <code>path</code> field in the {@doc
SwaggerPathsObject Paths Object}.
+ * from the <code>path</code> field in the paths object.
* <li>
* For all other cases, the name corresponds to the
parameter name used based on the <code>in</code> property.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc SwaggerPathTemplating Path Templating}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Property value is required.
@@ -272,7 +257,6 @@ public class SecuritySchemeInfo extends OpenApiElement {
*
* @param value
* The new value for this property.
- * <br>{@doc GFM} can be used for rich text representation.
* <br>Can be <jk>null</jk> to unset the property.
* @return This object
*/
@@ -327,11 +311,6 @@ public class SecuritySchemeInfo extends OpenApiElement {
* <p>
* The type of the parameter.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Valid values:
@@ -364,11 +343,6 @@ public class SecuritySchemeInfo extends OpenApiElement {
* <p>
* The extending format for the previously mentioned type.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc SwaggerDataTypeFormats}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getBearerFormat() {
@@ -381,11 +355,6 @@ public class SecuritySchemeInfo extends OpenApiElement {
* <p>
* The extending format for the previously mentioned type.
*
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='extlink'>{@doc SwaggerDataTypes}
- * </ul>
- *
* @param value The new value for this property.
* @return This object
*/
@@ -441,7 +410,7 @@ public class SecuritySchemeInfo extends OpenApiElement {
* <p>
* Determines the format of the array if type array is used.
*
- * @param value
+ * @param value The new value for this property.
* @return This object
*/
public SecuritySchemeInfo setOpenIdConnectUrl(String value) {
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Server.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Server.java
similarity index 99%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Server.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Server.java
index 2a1ae60af..c6e73585f 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Server.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Server.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/ServerVariable.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.java
similarity index 91%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/ServerVariable.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.java
index cc47816b4..389767de2 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/ServerVariable.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/ServerVariable.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -69,11 +69,6 @@ public class ServerVariable extends OpenApiElement {
/**
* Bean property getter: <property>enum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public List<Object> getEnum() {
@@ -83,11 +78,6 @@ public class ServerVariable extends OpenApiElement {
/**
* Bean property setter: <property>enum</property>.
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -140,11 +130,6 @@ public class ServerVariable extends OpenApiElement {
* Unlike JSON Schema this value MUST conform to the
defined <code>type</code> for the data type.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getDefault() {
@@ -165,11 +150,6 @@ public class ServerVariable extends OpenApiElement {
* Unlike JSON Schema this value MUST conform to the
defined <code>type</code> for the data type.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* <br>Can be <jk>null</jk> to unset the property.
@@ -194,11 +174,6 @@ public class ServerVariable extends OpenApiElement {
* Unlike JSON Schema this value MUST conform to the
defined <code>type</code> for the data type.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @return The property value, or <jk>null</jk> if it is not set.
*/
public String getDescription() {
@@ -219,11 +194,6 @@ public class ServerVariable extends OpenApiElement {
* Unlike JSON Schema this value MUST conform to the
defined <code>type</code> for the data type.
* </ul>
*
- * <h5 class='section'>See Also:</h5>
- * <ul>
- * <li class='extlink'>{@doc JsonSchemaValidation}
- * </ul>
- *
* @param value
* The new value for this property.
* @return This object
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Tag.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Tag.java
similarity index 94%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Tag.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Tag.java
index 42ecb6358..c45453cda 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Tag.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Tag.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
@@ -23,7 +23,7 @@ import org.apache.juneau.internal.*;
import java.util.Set;
/**
- * Allows adding meta data to a single tag that is used by the {@doc
SwaggerOperationObject Operation Object}.
+ * Allows adding meta data to a single tag that is used by the operation
object.
*
* <p>
* It is not mandatory to have a Tag Object per tag used there.
@@ -48,11 +48,6 @@ import java.util.Set;
* <js>"description"</js>: <js>"Pets operations"</js>
* }
* </p>
- *
- * <h5 class='section'>See Also:</h5>
- * <ul class='doctree'>
- * <li class='link'>{@doc juneau-dto.Swagger}
- * </ul>
*/
@Bean(properties="name,description,externalDocs,*")
@FluentSetters
@@ -138,7 +133,6 @@ public class Tag extends OpenApiElement {
*
* @param value
* The new value for this property.
- * <br>{@doc GFM} can be used for rich text representation.
* <br>Can be <jk>null</jk> to unset the property.
* @return This object
*/
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Xml.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Xml.java
similarity index 99%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Xml.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Xml.java
index e76a4f2aa..bcd44c20f 100644
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/Xml.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/Xml.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.dto.openapi;
+package org.apache.juneau.dto.openapi3;
import static org.apache.juneau.internal.StringUtils.*;
import static org.apache.juneau.internal.CollectionUtils.*;
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/package-info.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/package-info.java
similarity index 97%
rename from
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/package-info.java
rename to
juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/package-info.java
index 548edf481..259edd0fd 100755
---
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi/package-info.java
+++
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/openapi3/package-info.java
@@ -14,5 +14,5 @@
/**
* Swagger Data Transfer Objects
*/
-package org.apache.juneau.dto.openapi;
+package org.apache.juneau.dto.openapi3;
diff --git a/launches/juneau-create-workspace.sh b/juneau-create-workspace.sh
similarity index 99%
rename from launches/juneau-create-workspace.sh
rename to juneau-create-workspace.sh
index 4603500ae..ece2f3a25 100755
--- a/launches/juneau-create-workspace.sh
+++ b/juneau-create-workspace.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License.
*
#
***************************************************************************************************************************
-. launches/juneau-env.sh
+. juneau-env.sh
export WORKSPACE=target/workspace
diff --git a/juneau-doc/docs/ReleaseNotes/9.0.0.html
b/juneau-doc/docs/ReleaseNotes/9.0.0.html
index f7b46272b..215bb60ee 100644
--- a/juneau-doc/docs/ReleaseNotes/9.0.0.html
+++ b/juneau-doc/docs/ReleaseNotes/9.0.0.html
@@ -17,27 +17,20 @@
<div class='topic'>
<p>
- Juneau 9.0.0 is a major release.
+ Juneau 9.0.0 is a major release. Deprecated APIs that have
been accumulating over time have been removed.
+ The underlying code has undergone significant refactoring to
ease maintainability and improve overall performance.
</p>
<h5 class='topic w800'>General changes</h5>
<ul class='spaced-list'>
- <li>Configuration property names that are enabled by default
have been replaced with disabler properties.
- <br>For example, <jsf>BEAN_useInterfaceProxies</jsf>
which was enabled by default has been replaced with
<jsf>BEAN_disableUseInterfaceProxies</jsf>.
+ <li>
+ Configuration properties have been removed entirely.
They have been replaced with a standard builder-based
+ architecture. In addition to making the code more
maintainable, it also improves performance when
+ creating new serializers/parsers/rest clients (and
others).
</ul>
<h5 class='topic w800'>juneau-marshall</h5>
<ul class='spaced-list'>
- <li>
- New {@del oaj.annotation.Marshalled @Marshalled}
annotation for non-bean classes.
- <li>
- New {@link oaj.annotation.Bean#example()
@Bean(example)} annotation.
- <li>
- Changes to {@link oaj.annotation.Bean @Bean} annotation.
- <ul>
- <li><c>@Bean(bpi|bpx|bpro|bpwo)</c> replaced
with
<c>@Bean(properties|propertiesExclude|propertiesReadOnly|propertiesWriteOnly|p|xp|ro|o)</c>
- <li>New {@link oaj.annotation.Bean#example()
@Bean(example)} annotation.
- </ul>
<li>
Eliminated the various
<c><ja>@XConfig</ja>(applyX={...})</c> annotations and replaced them with the
ability
to apply targeted annotations directly to configuration
classes and methods (such as REST classes/methods).
@@ -47,7 +40,7 @@
|
<ja>@UrlEncoding</ja>(onClass=MyList.<jk>class</jk>,expandedParams=<jk>true</jk>)
| <jk>public class</jk> MyRestClass {
|
- | <ja>@RestMethod</ja>(...)
+ | <ja>@RestOp</ja>(...)
|
<ja>@Bean</ja>(on=<js>"MyBean1,MyBean2"</js>,sort=<jk>false</jk>)
|
<ja>@UrlEncoding</ja>(onClass=MyList.<jk>class</jk>,expandedParams=<jk>false</jk>)
| <jk>public</jk> Object
myRestMethod() { ... }
@@ -62,40 +55,80 @@
| <jc>// Shortened form</jc>
| <ja>@RemoteOp</ja>(<js>"PUT /foo"</js>)
</p>
+ <li>
+ New annotations: {@link
oaj.http.remote.RemoteGet}/{@link oaj.http.remote.RemotePut}/{@link
oaj.http.remote.RemotePost}/{@link oaj.http.remote.RemoteDelete}
+ <li>
+ Significant refactoring of the classes in the {@link
oaj.http} package and subpackages. Attempts were made to make classes as
natural
+ extensions to the Apache HttpComponents APIs.
Significant new functionality here.
+ <li>
+ New {@link oaj.annotation.Marshalled @Marshalled}
annotation for non-bean classes.
+ <li>
+ New {@link oaj.annotation.Bean#example()
@Bean(example)} annotation.
+ <li>
+ New {@link
oaj.annotation.BeanConfig#ignoreUnknownEnumValues()
@BeanConfig(ignoreUnknownEnumValues)} annotation and support for ignoring
+ unknown enum values during parsing.
+ <li>
+ Java Serialized Object marshalling support has been
removed entirely due to security risks with usage (better safe than sorry).
</ul>
<h5 class='topic w800'>juneau-rest-server</h5>
<ul class='spaced-list'>
<li>
- Removed deprecated APIs.
+ Significant refactoring done to allow for many
extensible aspects of the API to be performed through injected beans
+ in Spring. These include logging, debugging, REST
method arg types, static files, file finders, swagger creators, thrown stores,
response
+ processors, serializers/parsers, JSON schema
generators, statistics gathering stores, and default request attributes/headers
and response
+ headers.
+ <li>
+ Defining REST resources with predefined marshalling
support is now much simpler. You now extend from a basic REST servlet/object
+ class and then include an interface with predefined
common annotations.
+ <p class='bcode'>
+ | <jc>// A root resource that supports
JSON/HTML marshalling.</jc>
+ | <jk>public class</jk> MyRootResources
<jk>extends</jk> BasicRestServletGroup <jk>implements</jk> BasicJsonHtmlConfig
{ ... }
+ |
+ | <jc>// A child resource that supports
all available marshalling.</jc>
+ | <jk>public class</jk> MyChildResource
<jk>extends</jk> BasicRestObject <jk>implements</jk> BasicUniversalConfig { ...
}
+ </p>
+ REST servlets/objects are in the {@link oajr.servlet}
package and REST configs are in the {@link oajr.config} package.
<li>
- Removed the <c><ja>@RestMethod</ja>(name)</c>
annotation. Use <c><ja>@RestMethod</ja>(method)</c> instead.
+ <ja>@RestMethod</ja> annotation has been replaced with
+ {@link oaj.http.remote.RemoteGet} / {@link
oaj.http.remote.RemotePut} / {@link oaj.http.remote.RemotePost} / {@link
oaj.http.remote.RemoteDelete}
+ / {@link oaj.http.remote.RemoteOp}
<li>
- New shortened form {@del
oajr.annotation.RestMethod#value()} for specifying http method name and path.
+ New shortened form {@link
oajr.annotation.RestOp#value()} for specifying http method name and path.
<p class='bcode'>
| <jc>// Normal form</jc>
- |
<ja>@RestMethod</ja>(method=<jsf>PUT</jsf>, path=<js>"/{propertyName}"</js>)
+ | <ja>@RestOp</ja>(method=<jsf>PUT</jsf>,
path=<js>"/{propertyName}"</js>)
|
| <jc>// Shortened form</jc>
- | <ja>@RestMethod</ja>(<js>"PUT
/{propertyName}"</js>)
+ | <ja>@RestOp</ja>(<js>"PUT
/{propertyName}"</js>)
</p>
+ </ul>
+
+ <h5 class='topic w800'>juneau-dto</h5>
+ <ul class='spaced-list'>
<li>
- <c><ja>@RestMethod</ja>(name)</c> annotation. Use
<c><ja>@RestMethod</ja>(method)</c> instead.
+ Addition of OpenAPI 3.0 ({@link oaj.dto.openapi3}
package).
</ul>
<h5 class='topic w800'>juneau-rest-server-springboot</h5>
<ul class='spaced-list'>
+ <li>
+ The requirement for using <c>JuneauRestInitializer</c>
during App initialization to use bean injection has been eliminated.
+ Instead, root resources should simply extend from
{@link oajr.springboot.BasicSpringRestServlet} and {@link
oajr.springboot.BasicSpringRestServletGroup}.
+ These will automatically hook into the Spring Boot
framework for resolution of REST children and various extension beans added
+ to the REST API framework.
</ul>
<h5 class='topic w800'>juneau-rest-client</h5>
<ul class='spaced-list'>
<li>
- Replaced deprecated APIs with new RestClient API
introduced in 8.2.0.
+ While the general usage pattern stays the same, the
REST client code has undergone significant rewriting. It is now more inline
+ as an extension of the Apache HttpClient library. Much
new functionality such as support for fluent assertions has been added.
</ul>
<h5 class='topic w800'>juneau-rest-mock</h5>
<ul class='spaced-list'>
<li>
- Replaced deprecated APIs with new RestClient API
introduced in 8.2.0.
+ Entirely rewritten. Changes too many to list.
</ul>
</div>
\ No newline at end of file
diff --git a/juneau-doc/docs/Topics/01.Overview.html
b/juneau-doc/docs/Topics/01.Overview.html
index e41a57329..d0f48cb1a 100644
--- a/juneau-doc/docs/Topics/01.Overview.html
+++ b/juneau-doc/docs/Topics/01.Overview.html
@@ -164,7 +164,7 @@
</tr>
<tr class='dark bb'>
<td rowspan="2"
style='text-align:center;font-weight:bold;padding:20px;'
class='code'>juneau-examples</td>
- <td class='code'><a class='doclink'
href='#juneau-examples-core'>juneau-examples-core</a></td>
+ <td class='code'>juneau-examples-core</td>
<td>
<ul>
<li>Core code examples
@@ -173,7 +173,7 @@
<td></td>
</tr>
<tr class='dark bb'>
- <td class='code'><a class='doclink'
href='#juneau-examples-rest'>juneau-examples-rest</a></td>
+ <td class='code'>juneau-examples-rest</td>
<td>
<ul>
<li>REST code examples
diff --git a/juneau-doc/docs/overview_template.html
b/juneau-doc/docs/overview_template.html
index 0a780434c..7d458fe27 100644
--- a/juneau-doc/docs/overview_template.html
+++ b/juneau-doc/docs/overview_template.html
@@ -131,25 +131,25 @@
<tr class='dark bb'>
<td rowspan="4"
style='text-align:center;font-weight:bold;padding:20px;'>Examples</td>
- <td class='code'><a class='doclink'
href='#juneau-examples-core'>juneau-examples-core</a></td>
+ <td class='code'>juneau-examples-core</td>
<td>
Juneau Core API examples.
</td>
</tr>
<tr class='dark bb'>
- <td class='code'><a class='doclink'
href='#juneau-examples-rest'>juneau-examples-rest</a></td>
+ <td class='code'>juneau-examples-rest</td>
<td>
Juneau REST API examples.
</td>
</tr>
<tr class='dark bb'>
- <td class='code'><a class='doclink'
href='#juneau-examples-rest-jetty'>juneau-examples-rest-jetty</a></td>
+ <td class='code'>juneau-examples-rest-jetty</td>
<td>
Juneau REST API examples using Jetty deployment.
</td>
</tr>
<tr class='dark bb'>
- <td class='code'><a class='doclink'
href='#juneau-examples-rest-springboot'>juneau-examples-rest-springboot</a></td>
+ <td class='code'>juneau-examples-rest-springboot</td>
<td>
Juneau REST API examples using Spring Boot deployment.
</td>
diff --git a/launches/juneau-env.sh b/juneau-env.sh
similarity index 100%
rename from launches/juneau-env.sh
rename to juneau-env.sh
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/DtoExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/DtoExample.java
index d988735c0..0ccf5605d 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/DtoExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/DtoExample.java
@@ -30,7 +30,6 @@ import java.net.*;
* Sub module of the core.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomFeed.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomFeed.java
index bdefe27fd..6400b8883 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomFeed.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomFeed.java
@@ -22,7 +22,6 @@ import java.net.*;
* Atom feed example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomHtmlExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomHtmlExample.java
index 9af1d25cd..f9499dd46 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomHtmlExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomHtmlExample.java
@@ -19,7 +19,6 @@ import org.apache.juneau.html.HtmlSerializer;
* Atom feed HTML example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomJsonExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomJsonExample.java
index f5360cd25..481a232f5 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomJsonExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomJsonExample.java
@@ -20,7 +20,6 @@ import org.apache.juneau.json.SimpleJsonSerializer;
* Atom feed JSON example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomXmlExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomXmlExample.java
index 5f20d75a0..d0b8566fb 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomXmlExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/dto/atom/AtomXmlExample.java
@@ -19,7 +19,6 @@ import org.apache.juneau.xml.XmlSerializer;
* Atom feed XML example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlComplexExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlComplexExample.java
index ca804966d..91884a08c 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlComplexExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlComplexExample.java
@@ -25,7 +25,6 @@ import java.util.List;
* Sample class which shows the complex usage of HtmlSerializer and HtmlParser.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlSimpleExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlSimpleExample.java
index f5d0aee1c..ba1767155 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlSimpleExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/html/HtmlSimpleExample.java
@@ -21,7 +21,6 @@ import org.apache.juneau.html.HtmlSerializer;
* Sample class which shows the simple usage of HtmlSerializer and HtmlParser.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonComplexExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonComplexExample.java
index 605125200..dc6246d9b 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonComplexExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonComplexExample.java
@@ -24,7 +24,6 @@ import java.util.List;
* Sample class which shows the complex usage of JsonSerializer and JsonParser.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
index 3fe291219..e902841e2 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonConfigurationExample.java
@@ -26,7 +26,6 @@ import org.apache.juneau.json.*;
* Json configuration example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonSimpleExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonSimpleExample.java
index 322c0d9ea..233b9a077 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonSimpleExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/json/JsonSimpleExample.java
@@ -30,7 +30,6 @@ import java.util.Map;
* Sample class which shows the simple usage of JsonSerializer and JsonParser.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/oapi/OapiExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/oapi/OapiExample.java
index b7c7714c1..bbdafbf75 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/oapi/OapiExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/oapi/OapiExample.java
@@ -22,7 +22,6 @@ import org.apache.juneau.oapi.*;
* Sample class which shows the simple usage of OpenApiSerializer.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/Pojo.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/Pojo.java
index 1d91ec715..b7eb204df 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/Pojo.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/Pojo.java
@@ -18,7 +18,6 @@ import org.apache.juneau.annotation.*;
* Sample pojo class.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/PojoComplex.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/PojoComplex.java
index 5084b1e4d..eb8cabf98 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/PojoComplex.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/pojo/PojoComplex.java
@@ -20,7 +20,6 @@ import org.apache.juneau.annotation.*;
* Complex Pojo class.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfComplexExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfComplexExample.java
index 560f9716c..d7356026d 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfComplexExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfComplexExample.java
@@ -25,7 +25,6 @@ import java.util.List;
* Sample class which shows the complex usage of RdfXmlSerializer.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfExample.java
index a4c542a94..1446734a7 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/rdf/RdfExample.java
@@ -19,7 +19,6 @@ import org.apache.juneau.jena.*;
* Sample class which shows the simple usage of RdfXmlSerializer.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/svl/SvlExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/svl/SvlExample.java
index 1bbda5d61..ec20aed05 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/svl/SvlExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/svl/SvlExample.java
@@ -18,7 +18,6 @@ import org.apache.juneau.svl.*;
* Simple Variable Language examples.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonComplexExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonComplexExample.java
index 3172a1d36..f70c02639 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonComplexExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonComplexExample.java
@@ -25,7 +25,6 @@ import java.util.List;
* UON complex example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonExample.java
index d4db07bef..30d8506f3 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/uon/UonExample.java
@@ -20,7 +20,6 @@ import org.apache.juneau.uon.UonSerializer;
* Sample class which shows the simple usage of UONSerializer.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlComplexExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlComplexExample.java
index 86cb07324..f3cf4e005 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlComplexExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlComplexExample.java
@@ -21,7 +21,6 @@ import org.apache.juneau.xml.*;
* Sample class which shows the complex usage of XmlSerializer.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlConfigurationExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlConfigurationExample.java
index 989f9850b..985bca2b5 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlConfigurationExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlConfigurationExample.java
@@ -23,7 +23,6 @@ import java.util.List;
* Xml configuration example.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlSimpleExample.java
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlSimpleExample.java
index e32e69d3b..17a70467a 100644
---
a/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlSimpleExample.java
+++
b/juneau-examples/juneau-examples-core/src/main/java/org/apache/juneau/examples/core/xml/XmlSimpleExample.java
@@ -20,7 +20,6 @@ import org.apache.juneau.xml.XmlSerializer;
* Sample class which shows the simple usage of XmlSerializer.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-core}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AdminGuard.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AdminGuard.java
index 11c7898a4..d16f59e0b 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AdminGuard.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/AdminGuard.java
@@ -19,7 +19,6 @@ import org.apache.juneau.rest.guard.*;
* Sample guard that only lets administrators through.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
index 81a962e28..ba785909c 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/HelloWorldResource.java
@@ -21,7 +21,6 @@ import org.apache.juneau.rest.servlet.*;
* Sample REST resource that prints out a simple "Hello world!" message.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
index 32032a64d..7cb1b4c00 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RequestEchoResource.java
@@ -31,7 +31,6 @@ import org.apache.juneau.swaps.*;
* Sample REST resource for echoing HttpServletRequests back to the browser.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
index af53c3d73..2cbb0f8c6 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/RootResources.java
@@ -25,7 +25,6 @@ import org.apache.juneau.serializer.annotation.*;
* Sample REST resource showing how to implement a "router" resource page.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/command/EchoCommand.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/command/EchoCommand.java
index e90806d1b..7bc8d0cc2 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/command/EchoCommand.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/command/EchoCommand.java
@@ -22,7 +22,6 @@ import org.apache.juneau.microservice.console.*;
* Implements an 'echo' console command that simply returns the command
arguments as a comma-delimited list.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*/
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
index 05a46aaae..91dd5984b 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/AtomFeedResource.java
@@ -32,7 +32,6 @@ import org.apache.juneau.serializer.annotation.*;
* Sample resource that shows how to generate ATOM feeds.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
index 21a38e145..902778b1d 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/DtoExamples.java
@@ -23,7 +23,6 @@ import org.apache.juneau.serializer.annotation.*;
* Sample REST resource showing how to implement a nested "router" resource
page.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*
diff --git
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
index aafabd46b..a1c0f8dd4 100644
---
a/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
+++
b/juneau-examples/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/dto/JsonSchemaResource.java
@@ -25,7 +25,6 @@ import org.apache.juneau.rest.widget.*;
* Sample resource that shows how to serialize JSON-Schema documents.
*
* <ul class='seealso'>
- * <li class='link'>{@doc juneau-examples-rest}
* <li class='extlink'>{@source}
* </ul>
*
diff --git a/launches/juneau-open-javadoc.sh b/juneau-open-javadoc.sh
similarity index 98%
rename from launches/juneau-open-javadoc.sh
rename to juneau-open-javadoc.sh
index 9e3d86302..385980bd7 100755
--- a/launches/juneau-open-javadoc.sh
+++ b/juneau-open-javadoc.sh
@@ -11,7 +11,7 @@
# * specific language governing permissions and limitations under the License.
*
#
***************************************************************************************************************************
-. launches/juneau-env.sh
+. juneau-env.sh
open target/site/apidocs/overview-summary.html
diff --git a/launches/juneau-open-javadoc.launch
b/launches/juneau-open-javadoc.launch
index 39a536012..505d2fb74 100644
--- a/launches/juneau-open-javadoc.launch
+++ b/launches/juneau-open-javadoc.launch
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration
type="org.eclipse.ui.externaltools.ProgramLaunchConfigurationType">
-<stringAttribute key="bad_container_name" value="/juneau/ju"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${workspace_loc:/juneau/launches/juneau-open-javadoc.sh}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY"
value="${workspace_loc:/juneau}"/>
+ <stringAttribute key="bad_container_name" value="/juneau/ju"/>
+ <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+ <listEntry value="org.eclipse.ui.externaltools.launchGroup"/>
+ </listAttribute>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION"
value="${workspace_loc:/juneau/juneau-open-javadoc.sh}"/>
+ <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY"
value="${workspace_loc:/juneau}"/>
</launchConfiguration>
diff --git a/juneau-release.launch b/launches/juneau-release.launch
similarity index 100%
rename from juneau-release.launch
rename to launches/juneau-release.launch
