This is an automated email from the ASF dual-hosted git repository. dblevins pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 09fd5e89830669d75b7e76ae44e47d4b66b16bc2 Author: David Blevins <[email protected]> AuthorDate: Sat Apr 17 19:09:12 2021 -0700 TOMEE-3721 Remove dependencies between tomee-webapp modules We need to copy a bit of our setup data as we no longer get these resources from the main tomee-webapp --- .../tomee-microprofile-webapp/pom.xml | 2 +- .../META-INF/org.apache.tomee/service-jar.xml | 57 ++++++++++++++++++++++ .../src/main/resources/juli.properties | 45 +++++++++++++++++ tomee/tomee-plume-webapp/pom.xml | 2 +- .../META-INF/org.apache.tomee/service-jar.xml | 57 ++++++++++++++++++++++ .../src/main/resources/juli.properties | 45 +++++++++++++++++ tomee/tomee-plus-webapp/pom.xml | 2 +- .../META-INF/org.apache.tomee/service-jar.xml | 57 ++++++++++++++++++++++ .../src/main/resources/juli.properties | 45 +++++++++++++++++ tomee/tomee-webapp/src/main/assembly/war.xml | 57 +++++++++++++--------- 10 files changed, 343 insertions(+), 26 deletions(-) diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml index 64ed8d4..61ccc14 100644 --- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml +++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml @@ -31,7 +31,7 @@ <artifactId>tomee-microprofile-webapp</artifactId> <name>TomEE :: TomEE :: MicroProfile Webapp</name> - <packaging>war</packaging> + <packaging>jar</packaging> <properties> <tomee.build.name>${project.groupId}.tomee.microprofile.webapp</tomee.build.name> diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml new file mode 100644 index 0000000..dd6c6e5 --- /dev/null +++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + 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. +--> +<ServiceJar> + <ServiceProvider id="Default CMP Container" parent="org.apache.openejb:Default CMP Container"/> + <ServiceProvider id="Default BMP Container" parent="org.apache.openejb:Default BMP Container"/> + <ServiceProvider id="Default Stateless Container" parent="org.apache.openejb:Default Stateless Container"/> + <ServiceProvider id="Default Singleton Container" parent="org.apache.openejb:Default Singleton Container"/> + <ServiceProvider id="Default Stateful Container" parent="org.apache.openejb:Default Stateful Container"/> + <ServiceProvider id="Default Managed Container" parent="org.apache.openejb:Default Managed Container"/> + <ServiceProvider id="Default MDB Container" parent="org.apache.openejb:Default MDB Container"/> + <ServiceProvider id="Default JDK 1.3 ProxyFactory" parent="org.apache.openejb:Default JDK 1.3 ProxyFactory"/> + <ServiceProvider id="Tomcat Security Service" + class-name="org.apache.tomee.catalina.TomcatSecurityService" + service="SecurityService" + types="SecurityService"/> + <ServiceProvider id="PseudoSecurityService" parent="org.apache.openejb:PseudoSecurityService"/> + <ServiceProvider id="Default Security Service" parent="org.apache.openejb:Default Security Service"/> + <ServiceProvider id="Default Transaction Manager" parent="org.apache.openejb:Default Transaction Manager"/> + <ServiceProvider id="Default JDBC Database" parent="org.apache.openejb:Default JDBC Database"> + JdbcUrl=jdbc:hsqldb:file:data/hsqldb/hsqldb + </ServiceProvider> + <ServiceProvider id="Default Unmanaged JDBC Database" parent="org.apache.openejb:Default Unmanaged JDBC Database"> + JdbcUrl=jdbc:hsqldb:file:data/hsqldb/hsqldb + </ServiceProvider> + <ServiceProvider id="Default JMS Resource Adapter" parent="org.apache.openejb:Default JMS Resource Adapter"/> + <ServiceProvider id="Default JMS Connection Factory" parent="org.apache.openejb:Default JMS Connection Factory"/> + <ServiceProvider id="Default Queue" parent="org.apache.openejb:Default Queue"/> + <ServiceProvider id="Default Topic" parent="org.apache.openejb:Default Topic"/> + <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/> + <ServiceProvider id="Default Mail Session" parent="org.apache.openejb:Default Mail Session"/> + <ServiceProvider id="Default Remote Jndi Provider" parent="org.apache.openejb:Default Remote Jndi Provider"/> + <ServiceProvider id="RoutedDataSource" parent="org.apache.openejb:RoutedDataSource"/> + <ServiceProvider id="ProvidedByTomcat" service="Resource" class-name="org.apache.tomee.catalina.TomcatResourceFactory" factory-name="create"> + jndiName = + appName = + factory = + </ServiceProvider> + <ServiceProvider id="Default Executor Service" parent="org.apache.openejb:Default Executor Service" /> + <ServiceProvider id="Default Scheduled Executor Service" parent="org.apache.openejb:Default Scheduled Executor Service" /> + <ServiceProvider id="Default Managed Thread Factory" parent="org.apache.openejb:Default Managed Thread Factory" /> + <ServiceProvider id="Default Context Service" parent="org.apache.openejb:Default Context Service" /> +</ServiceJar> diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties new file mode 100644 index 0000000..873ce50 --- /dev/null +++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/resources/juli.properties @@ -0,0 +1,45 @@ +# +# 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. +# +# $Rev: 600336 $ $Date: 2007-12-02 18:01:12 +0100 (Sun, 02 Dec 2007) $ +# +############################################################ +# OpenEJB Handlers and Loggers +############################################################ + +OpenEJB.level = WARNING +OpenEJB.server.level = INFO +OpenEJB.startup.level = INFO +OpenEJB.startup.config.level = INFO +OpenEJB.hsql.level = INFO +OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler +CORBA-Adapter.hsql.level = ERROR +CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler +Transaction.level = WARNING +Transaction.handlers = 9Transaction.org.apache.juli.FileHandler +org.apache.activemq.level = ERROR +org.apache.activemq.handlers = OpenEJB.org.apache.juli.FileHandler +org.apache.geronimo.level = ERROR +org.apache.geronimo.handlers = 9OpenEJB.org.apache.juli.FileHandler +openjpa.level = ERROR +openjpa.handlers = 9OpenEJB.org.apache.juli.FileHandler + +9OpenEJB.org.apache.juli.FileHandler.level = FINE +9OpenEJB.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +9OpenEJB.org.apache.juli.FileHandler.prefix = openejb. +9Transaction.org.apache.juli.FileHandler.level = FINE +9Transaction.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +9Transaction.org.apache.juli.FileHandler.prefix = transaction. diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml index 01888f2..56026ab 100644 --- a/tomee/tomee-plume-webapp/pom.xml +++ b/tomee/tomee-plume-webapp/pom.xml @@ -31,7 +31,7 @@ <artifactId>tomee-plume-webapp</artifactId> <name>TomEE :: TomEE :: Plume Webapp</name> - <packaging>war</packaging> + <packaging>jar</packaging> <properties> <tomee.build.name>${project.groupId}.tomee.plume.webapp</tomee.build.name> diff --git a/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml b/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml new file mode 100644 index 0000000..dd6c6e5 --- /dev/null +++ b/tomee/tomee-plume-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + 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. +--> +<ServiceJar> + <ServiceProvider id="Default CMP Container" parent="org.apache.openejb:Default CMP Container"/> + <ServiceProvider id="Default BMP Container" parent="org.apache.openejb:Default BMP Container"/> + <ServiceProvider id="Default Stateless Container" parent="org.apache.openejb:Default Stateless Container"/> + <ServiceProvider id="Default Singleton Container" parent="org.apache.openejb:Default Singleton Container"/> + <ServiceProvider id="Default Stateful Container" parent="org.apache.openejb:Default Stateful Container"/> + <ServiceProvider id="Default Managed Container" parent="org.apache.openejb:Default Managed Container"/> + <ServiceProvider id="Default MDB Container" parent="org.apache.openejb:Default MDB Container"/> + <ServiceProvider id="Default JDK 1.3 ProxyFactory" parent="org.apache.openejb:Default JDK 1.3 ProxyFactory"/> + <ServiceProvider id="Tomcat Security Service" + class-name="org.apache.tomee.catalina.TomcatSecurityService" + service="SecurityService" + types="SecurityService"/> + <ServiceProvider id="PseudoSecurityService" parent="org.apache.openejb:PseudoSecurityService"/> + <ServiceProvider id="Default Security Service" parent="org.apache.openejb:Default Security Service"/> + <ServiceProvider id="Default Transaction Manager" parent="org.apache.openejb:Default Transaction Manager"/> + <ServiceProvider id="Default JDBC Database" parent="org.apache.openejb:Default JDBC Database"> + JdbcUrl=jdbc:hsqldb:file:data/hsqldb/hsqldb + </ServiceProvider> + <ServiceProvider id="Default Unmanaged JDBC Database" parent="org.apache.openejb:Default Unmanaged JDBC Database"> + JdbcUrl=jdbc:hsqldb:file:data/hsqldb/hsqldb + </ServiceProvider> + <ServiceProvider id="Default JMS Resource Adapter" parent="org.apache.openejb:Default JMS Resource Adapter"/> + <ServiceProvider id="Default JMS Connection Factory" parent="org.apache.openejb:Default JMS Connection Factory"/> + <ServiceProvider id="Default Queue" parent="org.apache.openejb:Default Queue"/> + <ServiceProvider id="Default Topic" parent="org.apache.openejb:Default Topic"/> + <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/> + <ServiceProvider id="Default Mail Session" parent="org.apache.openejb:Default Mail Session"/> + <ServiceProvider id="Default Remote Jndi Provider" parent="org.apache.openejb:Default Remote Jndi Provider"/> + <ServiceProvider id="RoutedDataSource" parent="org.apache.openejb:RoutedDataSource"/> + <ServiceProvider id="ProvidedByTomcat" service="Resource" class-name="org.apache.tomee.catalina.TomcatResourceFactory" factory-name="create"> + jndiName = + appName = + factory = + </ServiceProvider> + <ServiceProvider id="Default Executor Service" parent="org.apache.openejb:Default Executor Service" /> + <ServiceProvider id="Default Scheduled Executor Service" parent="org.apache.openejb:Default Scheduled Executor Service" /> + <ServiceProvider id="Default Managed Thread Factory" parent="org.apache.openejb:Default Managed Thread Factory" /> + <ServiceProvider id="Default Context Service" parent="org.apache.openejb:Default Context Service" /> +</ServiceJar> diff --git a/tomee/tomee-plume-webapp/src/main/resources/juli.properties b/tomee/tomee-plume-webapp/src/main/resources/juli.properties new file mode 100644 index 0000000..873ce50 --- /dev/null +++ b/tomee/tomee-plume-webapp/src/main/resources/juli.properties @@ -0,0 +1,45 @@ +# +# 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. +# +# $Rev: 600336 $ $Date: 2007-12-02 18:01:12 +0100 (Sun, 02 Dec 2007) $ +# +############################################################ +# OpenEJB Handlers and Loggers +############################################################ + +OpenEJB.level = WARNING +OpenEJB.server.level = INFO +OpenEJB.startup.level = INFO +OpenEJB.startup.config.level = INFO +OpenEJB.hsql.level = INFO +OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler +CORBA-Adapter.hsql.level = ERROR +CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler +Transaction.level = WARNING +Transaction.handlers = 9Transaction.org.apache.juli.FileHandler +org.apache.activemq.level = ERROR +org.apache.activemq.handlers = OpenEJB.org.apache.juli.FileHandler +org.apache.geronimo.level = ERROR +org.apache.geronimo.handlers = 9OpenEJB.org.apache.juli.FileHandler +openjpa.level = ERROR +openjpa.handlers = 9OpenEJB.org.apache.juli.FileHandler + +9OpenEJB.org.apache.juli.FileHandler.level = FINE +9OpenEJB.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +9OpenEJB.org.apache.juli.FileHandler.prefix = openejb. +9Transaction.org.apache.juli.FileHandler.level = FINE +9Transaction.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +9Transaction.org.apache.juli.FileHandler.prefix = transaction. diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index 0ff687f..97e5398 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -29,7 +29,7 @@ <modelVersion>4.0.0</modelVersion> <artifactId>tomee-plus-webapp</artifactId> <name>TomEE :: TomEE :: Plus Webapp</name> - <packaging>war</packaging> + <packaging>jar</packaging> <properties> <tomee.build.name>${project.groupId}.tomee.plus.webapp</tomee.build.name> diff --git a/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml b/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml new file mode 100644 index 0000000..dd6c6e5 --- /dev/null +++ b/tomee/tomee-plus-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- + 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. +--> +<ServiceJar> + <ServiceProvider id="Default CMP Container" parent="org.apache.openejb:Default CMP Container"/> + <ServiceProvider id="Default BMP Container" parent="org.apache.openejb:Default BMP Container"/> + <ServiceProvider id="Default Stateless Container" parent="org.apache.openejb:Default Stateless Container"/> + <ServiceProvider id="Default Singleton Container" parent="org.apache.openejb:Default Singleton Container"/> + <ServiceProvider id="Default Stateful Container" parent="org.apache.openejb:Default Stateful Container"/> + <ServiceProvider id="Default Managed Container" parent="org.apache.openejb:Default Managed Container"/> + <ServiceProvider id="Default MDB Container" parent="org.apache.openejb:Default MDB Container"/> + <ServiceProvider id="Default JDK 1.3 ProxyFactory" parent="org.apache.openejb:Default JDK 1.3 ProxyFactory"/> + <ServiceProvider id="Tomcat Security Service" + class-name="org.apache.tomee.catalina.TomcatSecurityService" + service="SecurityService" + types="SecurityService"/> + <ServiceProvider id="PseudoSecurityService" parent="org.apache.openejb:PseudoSecurityService"/> + <ServiceProvider id="Default Security Service" parent="org.apache.openejb:Default Security Service"/> + <ServiceProvider id="Default Transaction Manager" parent="org.apache.openejb:Default Transaction Manager"/> + <ServiceProvider id="Default JDBC Database" parent="org.apache.openejb:Default JDBC Database"> + JdbcUrl=jdbc:hsqldb:file:data/hsqldb/hsqldb + </ServiceProvider> + <ServiceProvider id="Default Unmanaged JDBC Database" parent="org.apache.openejb:Default Unmanaged JDBC Database"> + JdbcUrl=jdbc:hsqldb:file:data/hsqldb/hsqldb + </ServiceProvider> + <ServiceProvider id="Default JMS Resource Adapter" parent="org.apache.openejb:Default JMS Resource Adapter"/> + <ServiceProvider id="Default JMS Connection Factory" parent="org.apache.openejb:Default JMS Connection Factory"/> + <ServiceProvider id="Default Queue" parent="org.apache.openejb:Default Queue"/> + <ServiceProvider id="Default Topic" parent="org.apache.openejb:Default Topic"/> + <ServiceProvider id="Default ORB" parent="org.apache.openejb:Default ORB"/> + <ServiceProvider id="Default Mail Session" parent="org.apache.openejb:Default Mail Session"/> + <ServiceProvider id="Default Remote Jndi Provider" parent="org.apache.openejb:Default Remote Jndi Provider"/> + <ServiceProvider id="RoutedDataSource" parent="org.apache.openejb:RoutedDataSource"/> + <ServiceProvider id="ProvidedByTomcat" service="Resource" class-name="org.apache.tomee.catalina.TomcatResourceFactory" factory-name="create"> + jndiName = + appName = + factory = + </ServiceProvider> + <ServiceProvider id="Default Executor Service" parent="org.apache.openejb:Default Executor Service" /> + <ServiceProvider id="Default Scheduled Executor Service" parent="org.apache.openejb:Default Scheduled Executor Service" /> + <ServiceProvider id="Default Managed Thread Factory" parent="org.apache.openejb:Default Managed Thread Factory" /> + <ServiceProvider id="Default Context Service" parent="org.apache.openejb:Default Context Service" /> +</ServiceJar> diff --git a/tomee/tomee-plus-webapp/src/main/resources/juli.properties b/tomee/tomee-plus-webapp/src/main/resources/juli.properties new file mode 100644 index 0000000..873ce50 --- /dev/null +++ b/tomee/tomee-plus-webapp/src/main/resources/juli.properties @@ -0,0 +1,45 @@ +# +# 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. +# +# $Rev: 600336 $ $Date: 2007-12-02 18:01:12 +0100 (Sun, 02 Dec 2007) $ +# +############################################################ +# OpenEJB Handlers and Loggers +############################################################ + +OpenEJB.level = WARNING +OpenEJB.server.level = INFO +OpenEJB.startup.level = INFO +OpenEJB.startup.config.level = INFO +OpenEJB.hsql.level = INFO +OpenEJB.handlers = 9OpenEJB.org.apache.juli.FileHandler +CORBA-Adapter.hsql.level = ERROR +CORBA-Adapter.handlers = 9OpenEJB.org.apache.juli.FileHandler +Transaction.level = WARNING +Transaction.handlers = 9Transaction.org.apache.juli.FileHandler +org.apache.activemq.level = ERROR +org.apache.activemq.handlers = OpenEJB.org.apache.juli.FileHandler +org.apache.geronimo.level = ERROR +org.apache.geronimo.handlers = 9OpenEJB.org.apache.juli.FileHandler +openjpa.level = ERROR +openjpa.handlers = 9OpenEJB.org.apache.juli.FileHandler + +9OpenEJB.org.apache.juli.FileHandler.level = FINE +9OpenEJB.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +9OpenEJB.org.apache.juli.FileHandler.prefix = openejb. +9Transaction.org.apache.juli.FileHandler.level = FINE +9Transaction.org.apache.juli.FileHandler.directory = ${catalina.base}/logs +9Transaction.org.apache.juli.FileHandler.prefix = transaction. diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml index a00d820..9ecfa25 100644 --- a/tomee/tomee-webapp/src/main/assembly/war.xml +++ b/tomee/tomee-webapp/src/main/assembly/war.xml @@ -29,12 +29,9 @@ <fileSet> <directory>target/maven-shared-archive-resources</directory> <outputDirectory>/</outputDirectory> - <excludes> - <exclude>*.pom</exclude> - </excludes> </fileSet> <fileSet> - <directory>${basedir}</directory> + <directory>${project.basedir}</directory> <includes> <include>README.txt</include> </includes> @@ -44,47 +41,61 @@ <outputDirectory>/</outputDirectory> </fileSet> <fileSet> - <directory>${project.build.directory}/webjars-resources/META-INF/resources</directory> - <outputDirectory>/</outputDirectory> - </fileSet> - <fileSet> <directory>${project.basedir}/target/classes</directory> <outputDirectory>/</outputDirectory> <excludes> - <exclude>META-INF/org.apache.tomee/**</exclude> <exclude>org/**</exclude> - <exclude>**/LICENSE</exclude> - <exclude>**/NOTICE</exclude> - <exclude>**/LICENSE.txt</exclude> - <exclude>**/NOTICE.txt</exclude> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/NOTICE</exclude> </excludes> </fileSet> <fileSet> - <directory>${basedir}/target/classes</directory> + <directory>${project.basedir}/target/classes</directory> <outputDirectory>WEB-INF/classes</outputDirectory> <excludes> - <exclude>**/META-INF/org.apache.tomee/service-jar.xml</exclude> - <exclude>**/LICENSE</exclude> - <exclude>**/NOTICE</exclude> - <exclude>**/LICENSE.txt</exclude> - <exclude>**/NOTICE.txt</exclude> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/NOTICE</exclude> </excludes> </fileSet> <fileSet> - <directory>${basedir}/target</directory> - <outputDirectory>lib</outputDirectory> + <directory>${project.build.directory}/${project.artifactId}-${project.version}/</directory> + <outputDirectory>/</outputDirectory> <includes> - <include>openejb-tomcat*.jar</include> + <include>WEB-INF/web.xml</include> + <include>WEB-INF/classes/**</include> + <include>**/*.html</include> + <include>**/*.css</include> + <include>**/*.js</include> + <!-- libs are handled with dependencies because exclude don't work too well bellow --> + <!-- if some deps are missing, they should be added as project dependencies --> + <include>lib/*.jar</include> </includes> + <excludes> + <exclude>%regex[(WEB-INF/)?lib/(tomee-)?myfaces(-api|-impl)?-.*.jar]</exclude> + </excludes> </fileSet> </fileSets> <dependencySets> <dependencySet> <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}-${artifact.baseVersion}.${artifact.extension}</outputFileNameMapping> <scope>runtime</scope> + <useTransitiveDependencies>true</useTransitiveDependencies> + <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> + <!-- provided --> + <exclude>org.apache.tomcat:*</exclude> + <exclude>org.apache.myfaces:*</exclude> + + <!-- should be in a pom exclusion but it does perfectly the trick --> + <exclude>org.springframework:*</exclude> + + <!-- wars and pom --> + <exclude>*:war</exclude> <exclude>*:pom</exclude> + <exclude>org.apache.geronimo.specs:geronimo-javamail_1.5_spec</exclude> + <exclude>org.apache.geronimo.javamail:geronimo-javamail_1.5_mail</exclude> + <exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude> + <exclude>org.apache.geronimo.javamail:geronimo-javamail_1.4_mail</exclude> </excludes> </dependencySet> <dependencySet>
