Added TomEE dist profile for MicroProfile.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8262b3bc Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8262b3bc Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8262b3bc Branch: refs/heads/master Commit: 8262b3bc445bb70b50a6346a8f285973dac02c3b Parents: 3317314 Author: Roberto Cortez <radcor...@yahoo.com> Authored: Wed Feb 28 16:44:13 2018 +0000 Committer: Roberto Cortez <radcor...@yahoo.com> Committed: Wed Feb 28 16:44:13 2018 +0000 ---------------------------------------------------------------------- tomee/apache-tomee/pom.xml | 61 + .../src/main/assembly/tomee-microprofile.xml | 84 ++ tomee/pom.xml | 2 + tomee/tomee-microprofile-webapp/pom.xml | 92 ++ .../src/main/assembly/war.xml | 92 ++ .../src/main/resources/META-INF/LICENSE | 1288 ++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 124 ++ tomee/tomee-microprofile/pom.xml | 40 + 8 files changed, 1783 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/apache-tomee/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml index 9cc3790..08047df 100644 --- a/tomee/apache-tomee/pom.xml +++ b/tomee/apache-tomee/pom.xml @@ -36,6 +36,7 @@ <webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir> <plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir> <plume.work-dir>${project.build.directory}/plume-work-dir</plume.work-dir> + <microprofile.work-dir>${project.build.directory}/microprofile-work-dir</microprofile.work-dir> </properties> <dependencies> @@ -225,6 +226,25 @@ </artifactItems> </configuration> </execution> + <execution> + <id>copy-tomcat-for-microprofile</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat</artifactId> + <version>${tomcat.version}</version> + <type>zip</type> + <outputDirectory>${microprofile.work-dir}</outputDirectory> + <destFileName>apache-tomcat-${tomcat.version}.zip</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> @@ -323,6 +343,22 @@ </source> </configuration> </execution> + <execution> + <id>execute-microprofile-installer</id> + <phase>prepare-package</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <properties> + <tomee.workdir>${microprofile.work-dir}</tomee.workdir> + <tomee.webapp>tomee-microprofile-webapp</tomee.webapp> + </properties> + <source> + new commands.SetupCommand(pom: this, log: log, project: project, ant: ant, properties: properties).execute() + </source> + </configuration> + </execution> </executions> </plugin> @@ -375,6 +411,21 @@ <goal>single</goal> </goals> </execution> + <execution> + <id>microprofile</id> + <phase>package</phase> + <configuration> + <descriptors> + <descriptor>src/main/assembly/tomee-microprofile.xml</descriptor> + </descriptors> + <attach>false</attach> + <appendAssemblyId>false</appendAssemblyId> + <finalName>apache-tomee-microprofile-${project.version}</finalName> + </configuration> + <goals> + <goal>single</goal> + </goals> + </execution> </executions> </plugin> @@ -420,6 +471,16 @@ <type>tar.gz</type> <classifier>plume</classifier> </artifact> + <artifact> + <file>${project.build.directory}/apache-tomee-microprofile-${project.version}.zip</file> + <type>zip</type> + <classifier>microprofile</classifier> + </artifact> + <artifact> + <file>${project.build.directory}/apache-tomee-microprofile-${project.version}.tar.gz</file> + <type>tar.gz</type> + <classifier>microprofile</classifier> + </artifact> </artifacts> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml ---------------------------------------------------------------------- diff --git a/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml b/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml new file mode 100644 index 0000000..7b7ecd5 --- /dev/null +++ b/tomee/apache-tomee/src/main/assembly/tomee-microprofile.xml @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ --> + +<assembly> + <id>tomee-microprofile</id> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>${microprofile.work-dir}/apache-tomcat-${tomcat.version}</directory> + <outputDirectory>/apache-tomee-microprofile-${project.version}</outputDirectory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>LICENSE</exclude> + <exclude>NOTICE</exclude> + <exclude>**/bin/**/*</exclude> + <exclude>**/lib/tomcat-annotations-api*.jar</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/target/maven-shared-archive-resources/META-INF/</directory> + <outputDirectory>/apache-tomee-microprofile-${project.version}</outputDirectory> + <includes> + <include>LICENSE</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/resources/META-INF/microprofile/</directory> + <outputDirectory>/apache-tomee-microprofile-${project.version}</outputDirectory> + <includes> + <include>*</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/target/classes</directory> + <outputDirectory>/apache-tomee-microprofile-${project.version}/bin</outputDirectory> + <includes> + <include>service.*</include> + <include>TomEE.*</include> + <include>tomee.bat</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/target/classes</directory> + <outputDirectory>/apache-tomee-microprofile-${project.version}/bin</outputDirectory> + <includes> + <include>*.sh</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + <fileSet> + <directory>${microprofile.work-dir}/apache-tomcat-${tomcat.version}</directory> + <outputDirectory>/apache-tomee-microprofile-${project.version}</outputDirectory> + <includes> + <include>**/bin/**/*</include> + </includes> + <fileMode>0755</fileMode> + </fileSet> + </fileSets> +</assembly> + http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/pom.xml b/tomee/pom.xml index 2a299cf..d781ef5 100644 --- a/tomee/pom.xml +++ b/tomee/pom.xml @@ -51,6 +51,8 @@ <module>tomee-util</module> <module>tomee-juli</module> <module>tomee-overlay-runner</module> + <module>tomee-microprofile</module> + <module>tomee-microprofile-webapp</module> <!--<module>tomee-deb</module>--> </modules> http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/tomee-microprofile-webapp/pom.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml new file mode 100644 index 0000000..2a6d9a3 --- /dev/null +++ b/tomee/tomee-microprofile-webapp/pom.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <artifactId>tomee</artifactId> + <groupId>org.apache.tomee</groupId> + <version>7.0.5-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + + <artifactId>tomee-microprofile-webapp</artifactId> + <name>OpenEJB :: TomEE :: MicroProfile Webapp</name> + <packaging>war</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <microprofile.version>1.1.0</microprofile.version> + <microprofile.config.impl.version>1.0</microprofile.config.impl.version> + </properties> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>tomee-webapp</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + <!-- + <dependency> + <groupId>org.eclipse.microprofile</groupId> + <artifactId>microprofile-bom</artifactId> + <version>${microprofile.version}</version> + <type>pom</type> + </dependency> + --> + + <dependency> + <groupId>org.apache.geronimo.config</groupId> + <artifactId>geronimo-config-impl</artifactId> + <version>${microprofile.config.impl.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>war</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>src/main/assembly/war.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/tomee/blob/8262b3bc/tomee/tomee-microprofile-webapp/src/main/assembly/war.xml ---------------------------------------------------------------------- diff --git a/tomee/tomee-microprofile-webapp/src/main/assembly/war.xml b/tomee/tomee-microprofile-webapp/src/main/assembly/war.xml new file mode 100644 index 0000000..9a7ba10 --- /dev/null +++ b/tomee/tomee-microprofile-webapp/src/main/assembly/war.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. +--> +<assembly> + <id>war</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>target/maven-shared-archive-resources</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${project.basedir}</directory> + <includes> + <include>README.txt</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/webapp</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + <fileSet> + <directory>${project.basedir}/target/classes</directory> + <outputDirectory>/</outputDirectory> + <excludes> + <exclude>org/**</exclude> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/NOTICE</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/target/classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <excludes> + <exclude>META-INF/LICENSE</exclude> + <exclude>META-INF/NOTICE</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/${project.artifactId}-${project.version}/</directory> + <outputDirectory>/</outputDirectory> + <includes> + <include>WEB-INF/web.xml</include> + <include>WEB-INF/classes/**</include> + <include>**/*.html</include> + <include>**/*.css</include> + <include>**/*.js</include> + <include>lib/*.jar</include> + </includes> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <scope>runtime</scope> + <excludes> + <!-- provided --> + <exclude>org.apache.tomcat:*</exclude> + <!-- wars and pom --> + <exclude>*:war</exclude> + <exclude>*:pom</exclude> + </excludes> + </dependencySet> + <dependencySet> + <outputDirectory>WEB-INF/lib</outputDirectory> + <scope>runtime</scope> + <includes> + <include>org.apache.tomee:tomee-loader</include> + <include>org.codehaus.swizzle:swizzle-stream</include> + </includes> + </dependencySet> + </dependencySets> +</assembly> +