Author: dain
Date: Wed Sep 19 00:52:23 2007
New Revision: 577186

URL: http://svn.apache.org/viewvc?rev=577186&view=rev
Log:
Moved itest web archive and standalone client from openejb-tomcat module to 
separate projects under itests
Changed openejb-tomcat to build a war file instead of a zip

Added:
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/war.xml
    openejb/trunk/openejb3/itests/openejb-itests-standalone-client/   (with 
props)
    openejb/trunk/openejb3/itests/openejb-itests-standalone-client/pom.xml
    openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/
    openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/
    
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/
    
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/client.xml
    openejb/trunk/openejb3/itests/openejb-itests-web/   (with props)
    openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml
    openejb/trunk/openejb3/itests/openejb-itests-web/src/
    openejb/trunk/openejb3/itests/openejb-itests-web/src/main/
    openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/
    openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml
Removed:
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/bin.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/itests.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/test.xml
Modified:
    openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
    openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
    openejb/trunk/openejb3/itests/pom.xml

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml?rev=577186&r1=577185&r2=577186&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/maven.xml Wed Sep 19 
00:52:23 2007
@@ -182,14 +182,9 @@
     <!--======================-->
 
     <goal name="setup:loader-webapp">
-      <!-- Unzip webapp and set openejb.home -->
-      <unjar src="${basedir}/target/openejb-tomcat-${openejb.version}-bin.zip" 
dest="${tomcat.webapps}"/>
-      <!--<delete file="${tomcat.home}/lib/annotations-api.jar"/>-->
-      
-      <!--<u:file var="fileAsFile" 
name="${tomcat.dist}/conf/Catalina/localhost"/>-->
-      <!--<j:if test="${!(fileAsFile.exists())}">-->
-        <!--<move file="${tomcat.webapps}/openejb/openejb.xml" 
todir="${tomcat.home}/conf/Catalina/localhost"/>-->
-      <!--</j:if>-->
+      <!-- Unzip openejb war -->
+      <mkdir dir="${tomcat.webapps}/openejb"/>
+      <unjar src="${basedir}/target/openejb-tomcat-${openejb.version}.war" 
dest="${tomcat.webapps}/openejb"/>
     </goal>
 
     <goal name="setup:itests">
@@ -205,7 +200,7 @@
 
     <goal name="setup:itests-war">
       <j:set var="targetDir" value="${basedir}/target/"/>
-      <j:set var="itests.war" 
value="openejb-tomcat-${openejb.version}-itests.war"/>
+      <j:set var="itests.war" 
value="openejb-itests-web-${openejb.version}.war"/>
 
       <u:file var="fileAsFile" name="${tomcat.home}/webapps/itests.war"/>
       <j:if test="${!(fileAsFile.exists())}">
@@ -245,7 +240,7 @@
       <attainGoal name="setup:loader-webapp"/>
       <attainGoal name="setup:itests-war"/>
       <attainGoal name="start:tomcat"/>
-      <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
+      <java 
jar="target/openejb-itests-standalone-client-${openejb.version}.jar" fork="yes">
         <sysproperty key="openejb.home" 
value="target/openejb-${openejb.version}"/>
         <sysproperty key="tomcat.home" value="${tomcat.home}"/>
           <sysproperty key="remote.servlet.url" 
value="http://127.0.0.1:8080/openejb/remote"/>
@@ -255,7 +250,7 @@
     </goal>
 
     <goal name="test:client">
-      <java jar="target/openejb-tomcat-${openejb.version}-test.jar" fork="yes">
+      <java 
jar="target/openejb-itests-standalone-client-${openejb.version}.jar" fork="yes">
         <sysproperty key="openejb.home" 
value="target/openejb-${openejb.version}"/>
         <sysproperty key="tomcat.home" value="${tomcat.home}"/>
         <sysproperty key="remote.servlet.url" 
value="http://127.0.0.1:8080/openejb/remote"/>

Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml?rev=577186&r1=577185&r2=577186&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/pom.xml Wed Sep 19 00:52:23 
2007
@@ -42,18 +42,40 @@
           </execution>
         </executions>
         <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/bin.xml</descriptor>
-            <descriptor>src/main/assembly/test.xml</descriptor>
-            <descriptor>src/main/assembly/itests.xml</descriptor>
-          </descriptors>
-          <archive>
-            <manifest>
-              <mainClass>org.apache.openejb.test.Main</mainClass>
-            </manifest>
-          </archive>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptor>src/main/assembly/war.xml</descriptor>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-standalone-client</artifactId>
+                  <version>${version}</version>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.apache.openejb</groupId>
+                  <artifactId>openejb-itests-web</artifactId>
+                  <version>${version}</version>
+                  <type>war</type>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -125,11 +147,6 @@
       <artifactId>openejb-hsql</artifactId>
       <version>${version}</version>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.apache.openejb</groupId>-->
-      <!--<artifactId>openejb-activemq</artifactId>-->
-      <!--<version>${version}</version>-->
-    <!--</dependency>-->
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>

Added: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/war.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/war.xml?rev=577186&view=auto
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/war.xml 
(added)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/assembly/war.xml 
Wed Sep 19 00:52:23 2007
@@ -0,0 +1,93 @@
+<?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>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <!-- TODO: There're two ways to leverage MRRP: 
+         -  o the one below
+         -  o pom.xml where MRRP is configured to output the files in the 
directory of our choice 
+         -->
+      <directory>target/maven-shared-archive-resources/META-INF</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+          <exclude>org/**</exclude>
+          <exclude>META-INF/LICENSE</exclude>
+          <exclude>META-INF/NOTICE</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory>WEB-INF/classes</outputDirectory>
+      <includes>
+          <include>org/apache/openejb/tomcat/installer/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>openejb-tomcat*.jar</include>
+      </includes>
+      <excludes>
+        <!-- TODO: Fix the exclusion to pick up the proper version -->
+        <exclude>openejb-tomcat-3.0-incubating-SNAPSHOT-test.*</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>lib</outputDirectory>
+      <scope>runtime</scope>
+      <excludes>
+          <exclude>org.apache.tomcat:catalina</exclude>
+          <exclude>org.apache.tomcat:annotations-api</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <scope>runtime</scope>
+      <includes>
+          <include>org.apache.openejb:openejb-loader</include>
+          <include>org.codehaus.swizzle:swizzle-stream</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+

Propchange: openejb/trunk/openejb3/itests/openejb-itests-standalone-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 19 00:52:23 2007
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Added: openejb/trunk/openejb3/itests/openejb-itests-standalone-client/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-standalone-client/pom.xml?rev=577186&view=auto
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-standalone-client/pom.xml 
(added)
+++ openejb/trunk/openejb3/itests/openejb-itests-standalone-client/pom.xml Wed 
Sep 19 00:52:23 2007
@@ -0,0 +1,90 @@
+<?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: 555756 $ $Date: 2007-07-12 13:56:49 -0700 (Thu, 12 Jul 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>itests</artifactId>
+    <groupId>org.apache.openejb</groupId>
+    <version>3.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>openejb-itests-standalone-client</artifactId>
+  <packaging>pom</packaging>
+  <name>OpenEJB :: iTests standalone client</name>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptor>src/main/assembly/client.xml</descriptor>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.openejb.test.Main</mainClass>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-client</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-itests-client</artifactId>
+      <version>${version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-itests-beans</artifactId>
+      <version>${version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+    </dependency>
+  </dependencies>
+</project>

Added: 
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/client.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/client.xml?rev=577186&view=auto
==============================================================================
--- 
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/client.xml
 (added)
+++ 
openejb/trunk/openejb3/itests/openejb-itests-standalone-client/src/main/assembly/client.xml
 Wed Sep 19 00:52:23 2007
@@ -0,0 +1,75 @@
+<?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>client</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>META-INF</outputDirectory>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <!-- TODO: There're two ways to leverage MRRP:
+         -  o the one below
+         -  o pom.xml where MRRP is configured to output the files in the 
directory of our choice
+         -->
+      <directory>target/maven-shared-archive-resources/META-INF</directory>
+      <outputDirectory>META-INF</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <includes>
+          <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+          <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+          
<include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+          
<include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+          <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+          <include>org.apache.xbean:xbean-finder</include>
+          <include>asm:asm</include>
+          <include>junit:junit</include>
+          <include>org.apache.openejb:openejb-itests-beans</include>
+          <include>org.apache.openejb:openejb-itests-client</include>
+          <include>org.apache.openejb:openejb-client</include>
+
+          <!-- ActiveMQ -->
+          <include>org.apache.activemq:activemq-core</include>
+          <include>backport-util-concurrent:backport-util-concurrent</include>
+          <include>commons-logging:commons-logging</include>
+          
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+      </includes>
+      <scope>test</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+

Propchange: openejb/trunk/openejb3/itests/openejb-itests-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Sep 19 00:52:23 2007
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.classpath
+.project
+.settings
+*.log
+junit*.properties
+target
+bin

Added: openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml?rev=577186&view=auto
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml (added)
+++ openejb/trunk/openejb3/itests/openejb-itests-web/pom.xml Wed Sep 19 
00:52:23 2007
@@ -0,0 +1,66 @@
+<?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: 555756 $ $Date: 2007-07-12 13:56:49 -0700 (Thu, 12 Jul 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>itests</artifactId>
+    <groupId>org.apache.openejb</groupId>
+    <version>3.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>openejb-itests-web</artifactId>
+  <packaging>pom</packaging>
+  <name>OpenEJB :: iTests web</name>
+  <build>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptor>src/main/assembly/war.xml</descriptor>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>openejb-itests-beans</artifactId>
+      <version>${version}</version>
+      <type>ejb</type>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>

Added: 
openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml?rev=577186&view=auto
==============================================================================
--- openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml 
(added)
+++ openejb/trunk/openejb3/itests/openejb-itests-web/src/main/assembly/war.xml 
Wed Sep 19 00:52:23 2007
@@ -0,0 +1,58 @@
+<?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>itests</id>
+  <formats>
+    <format>war</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <!-- TODO: There're two ways to leverage MRRP:
+         -  o the one below
+         -  o pom.xml where MRRP is configured to output the files in the 
directory of our choice
+         -->
+      <directory>target/maven-shared-archive-resources/META-INF</directory>
+      <outputDirectory>META-INF</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <includes>
+          <include>junit:junit</include>
+          <include>org.apache.openejb:openejb-itests-beans</include>
+      </includes>
+      <scope>test</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+

Modified: openejb/trunk/openejb3/itests/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/itests/pom.xml?rev=577186&r1=577185&r2=577186&view=diff
==============================================================================
--- openejb/trunk/openejb3/itests/pom.xml (original)
+++ openejb/trunk/openejb3/itests/pom.xml Wed Sep 19 00:52:23 2007
@@ -35,5 +35,7 @@
     <module>openejb-itests-beans</module>
     <module>openejb-itests-interceptor-beans</module>
     <module>openejb-itests-app</module>
+    <module>openejb-itests-web</module>
+    <module>openejb-itests-standalone-client</module>
   </modules>
 </project>


Reply via email to