buildbot failure in on tomee-trunk-ubuntu
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu/builds/424 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-commit' triggered this build Build Source Stamp: [branch master] e5b374b54b9f287707ec961d969eb0a5422ec517 Blamelist: Romain manni-Bucau BUILD FAILED: failed check-formatting test Sincerely, -The Buildbot
[jira] [Resolved] (TOMEE-1873) Add FatApp main which is designed for fatjar case and delegates to tomee embedded Main with fatjar config
[ https://issues.apache.org/jira/browse/TOMEE-1873?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-1873. --- Resolution: Fixed > Add FatApp main which is designed for fatjar case and delegates to tomee > embedded Main with fatjar config > - > > Key: TOMEE-1873 > URL: https://issues.apache.org/jira/browse/TOMEE-1873 > Project: TomEE > Issue Type: New Feature >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau > Fix For: 7.0.2 > > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (TOMEE-1872) Map tomee embedded Configuration to its main
[ https://issues.apache.org/jira/browse/TOMEE-1872?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-1872. --- Resolution: Fixed > Map tomee embedded Configuration to its main > > > Key: TOMEE-1872 > URL: https://issues.apache.org/jira/browse/TOMEE-1872 > Project: TomEE > Issue Type: New Feature >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau > Fix For: 7.0.2 > > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
tomee git commit: TOMEE-1872 TOMEE-1873 wiring more options of tomee embedded to its main and adding FatApp for fatjar which is a Main for shades
Repository: tomee
Updated Branches:
refs/heads/master 0486f3f7f -> e5b374b54
TOMEE-1872 TOMEE-1873 wiring more options of tomee embedded to its main and
adding FatApp for fatjar which is a Main for shades
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e5b374b5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e5b374b5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e5b374b5
Branch: refs/heads/master
Commit: e5b374b54b9f287707ec961d969eb0a5422ec517
Parents: 0486f3f
Author: Romain manni-Bucau
Authored: Mon Jul 18 08:34:51 2016 +0200
Committer: Romain manni-Bucau
Committed: Mon Jul 18 08:34:51 2016 +0200
--
.../java/org/apache/tomee/embedded/FatApp.java | 41
.../apache/tomee/embedded/LifecycleTask.java| 23 +++
.../java/org/apache/tomee/embedded/Main.java| 186 ++-
.../junit/TomEEEmbeddedSingleRunner.java| 7 +-
4 files changed, 244 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/e5b374b5/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
--
diff --git
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
new file mode 100644
index 000..19e8bd4
--- /dev/null
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/FatApp.java
@@ -0,0 +1,41 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.embedded;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import static java.util.Arrays.asList;
+
+// Main like forcing --as-war --single-classloader
+// commong for fatjars
+public class FatApp {
+public static void main(final String[] args) {
+final Collection a = args == null || args.length == 0 ? new
ArrayList() : new ArrayList<>(asList(args));
+if (!a.contains("--as-war")) {
+a.add("--as-war");
+}
+if (!a.contains("--single-classloader")) {
+a.add("--single-classloader");
+}
+Main.main(a.toArray(new String[a.size()]));
+}
+
+private FatApp() {
+// no-op
+}
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e5b374b5/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/LifecycleTask.java
--
diff --git
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/LifecycleTask.java
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/LifecycleTask.java
new file mode 100644
index 000..194806b
--- /dev/null
+++
b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/LifecycleTask.java
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomee.embedded;
+
+import java.io.Closeable;
+
+public interface LifecycleTask {
+Closeable beforeContainerStartup();
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/e5b374b5/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
--
diff --git
a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedde
[jira] [Created] (TOMEE-1873) Add FatApp main which is designed for fatjar case and delegates to tomee embedded Main with fatjar config
Romain Manni-Bucau created TOMEE-1873: - Summary: Add FatApp main which is designed for fatjar case and delegates to tomee embedded Main with fatjar config Key: TOMEE-1873 URL: https://issues.apache.org/jira/browse/TOMEE-1873 Project: TomEE Issue Type: New Feature Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 7.0.2 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (TOMEE-1872) Map tomee embedded Configuration to its main
Romain Manni-Bucau created TOMEE-1872: - Summary: Map tomee embedded Configuration to its main Key: TOMEE-1872 URL: https://issues.apache.org/jira/browse/TOMEE-1872 Project: TomEE Issue Type: New Feature Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 7.0.2 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
buildbot success in on tomee-trunk-ubuntu
The Buildbot has detected a restored build on builder tomee-trunk-ubuntu while building . Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu/builds/423 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: forced: by IRC user on channel #openejb: None Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot failure in on tomee-trunk-ubuntu
The Buildbot has detected a new failure on builder tomee-trunk-ubuntu while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-trunk-ubuntu/builds/422 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: hemera_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-trunk-ubuntu-commit' triggered this build Build Source Stamp: [branch master] 0486f3f7f3482972d89bed06000d9a6456e3b2df Blamelist: Romain manni-Bucau BUILD FAILED: failed test Sincerely, -The Buildbot
[jira] [Resolved] (TOMEE-1871) deactivate tomee gui link since it is no more provided by default
[ https://issues.apache.org/jira/browse/TOMEE-1871?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau resolved TOMEE-1871. --- Resolution: Fixed > deactivate tomee gui link since it is no more provided by default > -- > > Key: TOMEE-1871 > URL: https://issues.apache.org/jira/browse/TOMEE-1871 > Project: TomEE > Issue Type: Bug >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau > Fix For: 7.0.2 > > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (TOMEE-1871) deactivate tomee gui link since it is no more provided by default
[ https://issues.apache.org/jira/browse/TOMEE-1871?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Romain Manni-Bucau updated TOMEE-1871: -- Summary: deactivate tomee gui link since it is no more provided by default (was: deactivate tomee gui since it is no more provided by default) > deactivate tomee gui link since it is no more provided by default > -- > > Key: TOMEE-1871 > URL: https://issues.apache.org/jira/browse/TOMEE-1871 > Project: TomEE > Issue Type: Bug >Reporter: Romain Manni-Bucau >Assignee: Romain Manni-Bucau > Fix For: 7.0.2 > > -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (TOMEE-1871) deactivate tomee gui since it is no more provided by default
Romain Manni-Bucau created TOMEE-1871: - Summary: deactivate tomee gui since it is no more provided by default Key: TOMEE-1871 URL: https://issues.apache.org/jira/browse/TOMEE-1871 Project: TomEE Issue Type: Bug Reporter: Romain Manni-Bucau Assignee: Romain Manni-Bucau Fix For: 7.0.2 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
tomee git commit: TOMEE-1871 deactivate tomee GUI link by default
Repository: tomee
Updated Branches:
refs/heads/master 1adec5221 -> 0486f3f7f
TOMEE-1871 deactivate tomee GUI link by default
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0486f3f7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0486f3f7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0486f3f7
Branch: refs/heads/master
Commit: 0486f3f7f3482972d89bed06000d9a6456e3b2df
Parents: 1adec52
Author: Romain manni-Bucau
Authored: Sun Jul 17 14:13:42 2016 +0200
Committer: Romain manni-Bucau
Committed: Sun Jul 17 14:13:42 2016 +0200
--
.../main/java/org/apache/tomee/installer/Installer.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/0486f3f7/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
--
diff --git
a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index c420008..687f17f 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -97,7 +97,7 @@ public class Installer implements InstallerInterface {
addTomEEJuli();
addTomEEAdminConfInTomcatUsers();
-addTomEELinkToTomcatHome();
+// addTomEELinkToTomcatHome(); // we don't provide tomee GUI anymore
workaroundOnBat();
@@ -152,14 +152,14 @@ public class Installer implements InstallerInterface {
final String content;
if (!securityActivated) {
content =
-" \n" +
+" \n" +
" \n" +
"\n";
} else {
content =
-" " +
+" " +
roleUserTags +
"\n";
@@ -185,7 +185,7 @@ public class Installer implements InstallerInterface {
moveLibs();
addTomEEAdminConfInTomcatUsers();
-addTomEELinkToTomcatHome();
+// addTomEELinkToTomcatHome(); // we don't provide it anymore
workaroundOnBat();
@@ -233,6 +233,7 @@ public class Installer implements InstallerInterface {
}
}
+/*
private void addTomEELinkToTomcatHome() {
final File home = paths.getHome();
if(!home.exists()) {
@@ -255,6 +256,7 @@ public class Installer implements InstallerInterface {
"");
Installers.writeAll(home, newIndeJsp, alerts);
}
+*/
private void moveLibs() {
final File libs = paths.getCatalinaLibDir();
