Skip to content
Permalink
Browse files

Merge branch 'appng-1.19.x'

  • Loading branch information...
appng-buildmaster committed May 3, 2019
2 parents 5dada48 + d757e1b commit cc61fb51ccb5b66a3251c5e50123769efc520c9f
Showing 889 changed files with 7,023 additions and 4,835 deletions.
@@ -32,15 +32,15 @@ node {
sh "'${mvnHome}/bin/mvn' javadoc:aggregate"
}

stage('Results') {
junit '**/target/surefire-reports/*.xml'
}

currentBuild.result = 'SUCCESS'
} catch (Exception err) {
currentBuild.result = 'FAILURE'
}

stage('Results') {
junit '**/target/surefire-reports/*.xml'
}

stage ('notifyFinish'){
// send to email
emailext (
@@ -1,6 +1,6 @@
image::https://www.aiticon.com/assets/images/appng_logo_760px.jpg[]
:snapshot: 1.18.1-SNAPSHOT
:stable: 1.18.0
:snapshot: 1.19.1-SNAPSHOT
:stable: 1.19.0
:current: {stable}
ifdef::env-github[]
:caution-caption: :fire:
@@ -66,23 +66,23 @@ The standalone version also comes with *appNGizer*, the REST-based administratio
The standalone version can be found here:
https://appng.org/appng/builds/stable/appng-standalone-{stable}.zip

Check that Java 1.8 is available in your system's path:
Check that Java >= 1.8 is available in your system's path:
----
$ java -version
openjdk version "1.8.0_131"
OpenJDK Runtime Environment (build 1.8.0_131-8u131-b11-1~bpo8+1-b11)
OpenJDK 64-Bit Server VM (build 25.131-b11, mixed mode)
openjdk version "1.8.0_171"
OpenJDK Runtime Environment (build 1.8.0_171-8u171-b11-1~bpo8+1-b11)
OpenJDK 64-Bit Server VM (build 25.171-b11, mixed mode)
----

Unzip the file, change into the extracted folder and run
[source,subs=normal]
----
$ java -jar appng-standalone-{stable}.jar -i -u
./appng.sh
----

[NOTE]
====
When running under Windows, you have to add the option `-Dfile.encoding=UTF-8` before the `-jar` option.
When running under Windows, use `appng.bat`.
====

Wait a few seconds, until the console output stops, then visit http://localhost:8080/manager in your browser.
@@ -91,8 +91,10 @@ Sign-in with the username `admin` and the password `s3cr3t`.

[NOTE]
====
When executing the jar for the next time, you *must* omit the parameters `-u` and `-i`, as they are only
allowed on the very first run (`-u` unpacks and configures the wrapped web applications, `-i` is for installing the appNG applications and the template).
On the first run, some unpacking and installation operations are performed, this my take a few seconds. The subsequent starts will be much faster.
If you accidentally misconfigured your appNG instance, you can force a clean re-installation with the `-i` option: +
`./appng.sh -i`
====

=== Download and run the appNG web-application version
@@ -11,7 +11,7 @@
<parent>
<groupId>org.appng</groupId>
<artifactId>appng-parent</artifactId>
<version>1.18.0</version>
<version>1.19.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -151,7 +151,7 @@ Datafield getField(String name) {
* @return the {@link Map}
*/
public Map<String, String> getFieldValues() {
Map<String, String> values = new HashMap<String, String>();
Map<String, String> values = new HashMap<>();
for (Datafield datafield : getFields()) {
values.put(datafield.getName(), datafield.getValue());
}
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -261,7 +261,7 @@ public Linkpanel getLinkpanel() {
}

public void backupFields() {
this.originalFields = new ArrayList<FieldDef>(getFields());
this.originalFields = new ArrayList<>(getFields());
}

public void restoreFields() {
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -149,7 +149,7 @@ private void parse() {
}

private List<String> splitPath(String path) {
List<String> elements = new ArrayList<String>(Arrays.asList(path.split(SEPARATOR)));
List<String> elements = new ArrayList<>(Arrays.asList(path.split(SEPARATOR)));
if (elements.size() > 0) {
int lastIdx = elements.size() - 1;
String lastElement = elements.get(lastIdx);
@@ -312,12 +312,12 @@ private String initJspUrlParameters(File wwwRootFile) {
return params;
}
}
return new ArrayList<String>(0);
return new ArrayList<>(0);
}

public List<String> getJspUrlParameters() {
if (null == jspUrlParams) {
jspUrlParams = new ArrayList<String>();
jspUrlParams = new ArrayList<>();
}
return jspUrlParams;
}
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -173,7 +173,7 @@ private PermissionOwner(String name, Config config) {

private void setPermissions(Permissions permissions) {
if (null == permissions) {
this.permissions = Collections.unmodifiableList(new ArrayList<Permission>());
this.permissions = Collections.unmodifiableList(new ArrayList<>());
} else {
this.permissions = Collections.unmodifiableList(permissions.getPermissionList());
}
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -97,6 +97,9 @@ private Platform() {
public final class Property {
/** The absolute root-path of the platform */
public static final String PLATFORM_ROOT_PATH = "platformRootPath";

/** The absolute path to the data directory */
public static final String APPNG_DATA = "appngData";
/**
* The folder for the application-cache, relative to {@link #CACHE_FOLDER}. Applications might use this folder
* to cache temporary data.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,5 +1,5 @@
/*
* Copyright 2011-2018 the original author or authors.
* Copyright 2011-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Oops, something went wrong.

0 comments on commit cc61fb5

Please sign in to comment.
You can’t perform that action at this time.