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 2011/09/25 21:17:24 UTC
svn commit: r1175531 - in /openejb/trunk/openejb3/assembly/openejb-tomcat:
./ openejb-tomcat-bundle/tomee7/
openejb-tomcat-bundle/tomee7/src/main/assembly/
openejb-tomcat-bundle/utils/src/main/groovy/commands/
openejb-tomcat-enterprise-webapp/ openejb-...
Author: rmannibucau
Date: Sun Sep 25 19:17:23 2011
New Revision: 1175531
URL: http://svn.apache.org/viewvc?rev=1175531&view=rev
Log:
trying to deliver tomee webprofile and tomee enterprise (tomee plus)
Added:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/assembly/
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/assembly/war.xml
Removed:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/src/main/assembly/plus.xml
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml?rev=1175531&r1=1175530&r2=1175531&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/pom.xml Sun Sep 25 19:17:23 2011
@@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-tomee</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>OpenEJB :: Assembly :: TomEE :: Tomcat 7</name>
<dependencies>
@@ -102,7 +102,7 @@
<version>2.3</version>
<executions>
<execution>
- <id>copy</id>
+ <id>copy-tomcat-for-webprofile</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
@@ -114,7 +114,25 @@
<artifactId>apache-tomcat</artifactId>
<version>${tomcat.version}</version>
<type>zip</type>
- <outputDirectory>${project.build.directory}</outputDirectory>
+ <outputDirectory>${webprofile.work-dir}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-tomcat-for-enterprise</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>apache-tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ <type>zip</type>
+ <outputDirectory>${enterprise.work-dir}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
@@ -127,13 +145,49 @@
<artifactId>gmaven-plugin</artifactId>
<executions>
<execution>
- <id>execute-installer</id>
+ <id>execute-web-profile-installer</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>new commands.SetupCommand(this).execute()</source>
+ <properties>
+ <tomee.workdir>${webprofile.work-dir}</tomee.workdir>
+ <tomee.webapp>openejb-tomcat-webapp</tomee.webapp>
+ </properties>
+ <classpath>
+ <element>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </element>
+ <element>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>1.7.1</version>
+ <type>jar</type>
+ </element>
+ <element>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-tomee-utils</artifactId>
+ <version>${project.version}</version>
+ </element>
+ </classpath>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execute-enterprise-installer</id>
<phase>prepare-package</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>new commands.SetupCommand(this).execute()</source>
+ <properties>
+ <tomee.workdir>${enterprise.work-dir}</tomee.workdir>
+ <tomee.webapp>openejb-tomcat-enterprise-webapp</tomee.webapp>
+ </properties>
<classpath>
<element>
<groupId>jline</groupId>
@@ -160,14 +214,28 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>bin</id>
+ <id>web-profile</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomee.xml</descriptor>
+ </descriptors>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>apache-tomee-webprofile-${project.version}</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>enterprise</id>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/assembly/tomee.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
- <finalName>apache-tomee-${project.version}</finalName>
+ <finalName>apache-tomee-enterprise-${project.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
@@ -186,6 +254,9 @@
<http.proxy.username>${settings.activeProxy.username}</http.proxy.username>
<http.proxy.password>${settings.activeProxy.password}</http.proxy.password>
<http.proxy.nonProxyHosts>${settings.activeProxy.nonProxyHosts}</http.proxy.nonProxyHosts>
+
+ <webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir>
+ <enterprise.work-dir>${project.build.directory}/enterprise-work-dir</enterprise.work-dir>
</properties>
</project>
Added: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml?rev=1175531&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml (added)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/tomee7/src/main/assembly/tomee.xml Sun Sep 25 19:17:23 2011
@@ -0,0 +1,49 @@
+<?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>web-profile</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${basedir}/target/apache-tomcat-${tomcat.version}</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/bin/**/*</exclude>
+ <exclude>**/lib/tomcat-annotations-api*.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${basedir}/target/apache-tomcat-${tomcat.version}</directory>
+ <includes>
+ <include>**/bin/**/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy?rev=1175531&r1=1175530&r2=1175531&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-bundle/utils/src/main/groovy/commands/SetupCommand.groovy Sun Sep 25 19:17:23 2011
@@ -82,10 +82,12 @@ class SetupCommand {
}
def execute() {
+ def workDir = require('tomee.workdir')
+ def webapp = require('tomee.webapp')
def tomcatVersion = require('tomcat.version')
System.setProperty('tomcat.version', tomcatVersion)
def localRepo = require('localRepository')
- def openejbHome = "${project.build.directory}/apache-tomcat-${tomcatVersion}"
+ def openejbHome = "${workDir}/apache-tomcat-${tomcatVersion}"
def examplesVersion = require('examples.version')
def proxyHost = get('http.proxy.host', '')
@@ -107,8 +109,8 @@ class SetupCommand {
}
def source = ""
- def dest = "${project.build.directory}/apache-tomcat-${tomcatVersion}.zip"
- def catalinaHome = "${project.build.directory}/apache-tomcat-${tomcatVersion}"
+ def dest = "${workDir}/apache-tomcat-${tomcatVersion}.zip"
+ def catalinaHome = "${workDir}/apache-tomcat-${tomcatVersion}"
if (tomcatVersion =~ /^7\./) {
source = "http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcatVersion}/bin/apache-tomcat-${tomcatVersion}.zip"
@@ -124,11 +126,11 @@ class SetupCommand {
// ant.get(src: source, dest: dest)
- ant.unzip(src: dest, dest: "${project.build.directory}")
+ ant.unzip(src: dest, dest: "${workDir}")
ant.echo("Deploying the openejb war")
- ant.unzip(src: "${localRepo}/org/apache/openejb/openejb-tomcat-webapp/${project.version}/openejb-tomcat-webapp-${project.version}.war",
- dest: "${project.build.directory}/apache-tomcat-${tomcatVersion}/webapps/openejb")
+ ant.unzip(src: "${localRepo}/org/apache/openejb/${webapp}/${project.version}/${webapp}-${project.version}.war",
+ dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/openejb")
ant.echo("Installing to: ${catalinaHome}")
@@ -139,12 +141,12 @@ class SetupCommand {
installer.installAll()
ant.echo("Assigning execute privileges to scripts in Tomcat bin directory")
- ant.chmod(dir: "${project.build.directory}/apache-tomcat-${tomcatVersion}/bin", perm: "u+x", includes: "**/*.sh")
+ ant.chmod(dir: "${workDir}/apache-tomcat-${tomcatVersion}/bin", perm: "u+x", includes: "**/*.sh")
// ant.echo("Deploying the examples war")
// ant.unzip(src: "${localRepo}/org/superbiz/ejb-examples/${examplesVersion}/ejb-examples-${examplesVersion}.war",
-// dest: "${project.build.directory}/apache-tomcat-${tomcatVersion}/webapps/ejb-examples")
- ant.delete(dir: "${project.build.directory}/apache-tomcat-${tomcatVersion}/webapps/examples")
+// dest: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/ejb-examples")
+ ant.delete(dir: "${workDir}/apache-tomcat-${tomcatVersion}/webapps/examples")
}
}
Added: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/pom.xml?rev=1175531&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/pom.xml (added)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/pom.xml Sun Sep 25 19:17:23 2011
@@ -0,0 +1,151 @@
+<?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>openejb-tomcat</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>openejb-tomcat-enterprise-webapp</artifactId>
+ <name>OpenEJB :: Assembly :: Tomcat :: Enterprise Webapp</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-tomcat-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf-transport</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-cxf</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-rest</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-webservices</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>tomee-webservices</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/war.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Added: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/assembly/war.xml?rev=1175531&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/assembly/war.xml (added)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-enterprise-webapp/src/main/assembly/war.xml Sun Sep 25 19:17:23 2011
@@ -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: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>war</id>
+ <formats>
+ <format>war</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>README.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ <include>NOTICE.txt</include>
+ <include>LICENSE.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>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/${project.artifactId}-${project.version}/lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <scope>runtime</scope>
+ <excludes>
+ <!-- provided -->
+ <exclude>org.apache.tomcat:*</exclude>
+
+ <!-- should be in a pom exclusion but it does perfectly the trick -->
+ <exclude>org.springframework:*</exclude>
+
+ <!-- wars -->
+ <exclude>org.apache.openejb:openejb-tomcat-webapp</exclude>
+ <exclude>org.apache.openejb:openejb-tomcat-enterprise-webapp</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.openejb:openejb-tomcat-loader</include>
+ <include>org.codehaus.swizzle:swizzle-stream</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
+
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1175531&r1=1175530&r2=1175531&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Sun Sep 25 19:17:23 2011
@@ -385,50 +385,6 @@
</dependency>
</dependencies>
</profile>
- <profile>
- <id>plus</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>war</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/plus.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </dependency>
- <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-cxf-rs</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
- <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-cxf-transport</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
- <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-cxf</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
- <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-rest</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
- <dependency><groupId>org.apache.openejb</groupId><artifactId>openejb-webservices</artifactId><version>${project.version}</version><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions><scope>runtime</scope></dependency>
- <dependency><groupId>org.apache.openejb</groupId><artifactId>tomee-webservices</artifactId><version>${project.version}</version><scope>runtime</scope><exclusions><exclusion><groupId>org.apache.openejb</groupId><artifactId>javaee-api</artifactId></exclusion></exclusions></dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- </dependency>
- </dependencies>
- </profile>
</profiles>
</project>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml?rev=1175531&r1=1175530&r2=1175531&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml Sun Sep 25 19:17:23 2011
@@ -39,6 +39,7 @@
<module>tomee-webservices</module>
<module>tomee-itests</module>
<module>tomee-embedded</module>
+ <module>openejb-tomcat-enterprise-webapp</module>
</modules>
<repositories>