You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/07/25 07:10:06 UTC
tomee git commit: TOMEE-1884 TOMEE-1883 propagate tomee embedded main
args to a component and adding an event with tomee embedded scanner to
extensions use the scanner too
Repository: tomee
Updated Branches:
refs/heads/master f38677d14 -> ca3cddba0
TOMEE-1884 TOMEE-1883 propagate tomee embedded main args to a component and adding an event with tomee embedded scanner to extensions use the scanner too
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ca3cddba
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ca3cddba
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ca3cddba
Branch: refs/heads/master
Commit: ca3cddba0a4023419d9bda2183e9583d6732388d
Parents: f38677d
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon Jul 25 08:55:40 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon Jul 25 08:55:40 2016 +0200
----------------------------------------------------------------------
.../org/apache/tomee/embedded/Container.java | 20 ++++++-----
.../java/org/apache/tomee/embedded/Main.java | 4 +++
.../embedded/component/TomEEEmbeddedArgs.java | 37 ++++++++++++++++++++
.../event/TomEEEmbeddedScannerCreated.java | 33 +++++++++++++++++
4 files changed, 86 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ca3cddba/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
index cd0cec0..bb2ccd5 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
@@ -73,6 +73,7 @@ import org.apache.tomee.catalina.TomEERuntimeException;
import org.apache.tomee.catalina.TomcatLoader;
import org.apache.tomee.catalina.remote.TomEERemoteWebapp;
import org.apache.tomee.catalina.session.QuickSessionManager;
+import org.apache.tomee.embedded.event.TomEEEmbeddedScannerCreated;
import org.apache.tomee.embedded.internal.StandardContextCustomizer;
import org.apache.tomee.util.QuickServerXmlParser;
import org.apache.velocity.Template;
@@ -81,6 +82,7 @@ import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.runtime.log.NullLogChute;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.UrlSet;
import org.apache.xbean.finder.filter.Filters;
import org.apache.xbean.recipe.ObjectRecipe;
@@ -236,16 +238,18 @@ public class Container implements AutoCloseable {
webModule.setAddedUrls(Collections.<URL>emptyList());
webModule.setRarUrls(Collections.<URL>emptyList());
webModule.setScannableUrls(jarList);
+ final AnnotationFinder finder;
try {
final String filterContainerClasses = SystemInstance.get().getProperty("tomee.embedded.filter-container-classes");
- webModule.setFinder(
- new FinderFactory.OpenEJBAnnotationFinder(
- // skip container classes in scanning for shades
- new WebappAggregatedArchive(webModule, jarList,
- // see org.apache.openejb.config.DeploymentsResolver.ClasspathSearcher.cleanUpUrlSet()
- jarList.size() <= 4 || "true".equalsIgnoreCase(filterContainerClasses) ?
- new ContainerClassesFilter(configuration.getProperties()) /* shade */ : null))
- .link());
+ finder = new FinderFactory.OpenEJBAnnotationFinder(
+ // skip container classes in scanning for shades
+ new WebappAggregatedArchive(webModule, jarList,
+ // see org.apache.openejb.config.DeploymentsResolver.ClasspathSearcher.cleanUpUrlSet()
+ jarList.size() <= 4 || "true".equalsIgnoreCase(filterContainerClasses) ?
+ new ContainerClassesFilter(configuration.getProperties()) /* shade */ : null))
+ .link();
+ SystemInstance.get().fireEvent(new TomEEEmbeddedScannerCreated(finder));
+ webModule.setFinder(finder);
} catch (final Exception e) {
throw new IllegalArgumentException(e);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/ca3cddba/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
index f9cd5af..e6bf317 100644
--- a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Main.java
@@ -24,6 +24,8 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
import org.apache.openejb.loader.ProvisioningUtil;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.tomee.embedded.component.TomEEEmbeddedArgs;
import java.io.Closeable;
import java.io.File;
@@ -122,6 +124,8 @@ public class Main {
contexts = null;
}
+ SystemInstance.get().setComponent(TomEEEmbeddedArgs.class, new TomEEEmbeddedArgs(args, line));
+
boolean autoWar;
if (line.hasOption(PATH)) {
int i = 0;
http://git-wip-us.apache.org/repos/asf/tomee/blob/ca3cddba/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/component/TomEEEmbeddedArgs.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/component/TomEEEmbeddedArgs.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/component/TomEEEmbeddedArgs.java
new file mode 100644
index 0000000..51bd8c5
--- /dev/null
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/component/TomEEEmbeddedArgs.java
@@ -0,0 +1,37 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.component;
+
+import org.apache.commons.cli.CommandLine;
+
+public class TomEEEmbeddedArgs {
+ private final String[] args;
+ private final CommandLine commandLine;
+
+ public TomEEEmbeddedArgs(final String[] args, final CommandLine commandLine) {
+ this.args = args;
+ this.commandLine = commandLine;
+ }
+
+ public String[] getArgs() {
+ return args;
+ }
+
+ public CommandLine getCommandLine() {
+ return commandLine;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/ca3cddba/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/event/TomEEEmbeddedScannerCreated.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/event/TomEEEmbeddedScannerCreated.java b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/event/TomEEEmbeddedScannerCreated.java
new file mode 100644
index 0000000..4110593
--- /dev/null
+++ b/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/event/TomEEEmbeddedScannerCreated.java
@@ -0,0 +1,33 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.event;
+
+import org.apache.openejb.observer.Event;
+import org.apache.xbean.finder.IAnnotationFinder;
+
+@Event
+public class TomEEEmbeddedScannerCreated {
+ private final IAnnotationFinder finder;
+
+ public TomEEEmbeddedScannerCreated(final IAnnotationFinder finder) {
+ this.finder = finder;
+ }
+
+ public IAnnotationFinder getFinder() {
+ return finder;
+ }
+}