You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2011/09/27 08:36:17 UTC

svn commit: r1176229 - in /openejb/trunk/openejb3/tck: bval-tomee/pom.xml cdi-tomee/pom.xml

Author: dblevins
Date: Tue Sep 27 06:36:17 2011
New Revision: 1176229

URL: http://svn.apache.org/viewvc?rev=1176229&view=rev
Log:
Fix paths to point at 'apache-tomee-webprofile' and reduce duplication of openejb.home

Modified:
    openejb/trunk/openejb3/tck/bval-tomee/pom.xml
    openejb/trunk/openejb3/tck/cdi-tomee/pom.xml

Modified: openejb/trunk/openejb3/tck/bval-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/bval-tomee/pom.xml?rev=1176229&r1=1176228&r2=1176229&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/bval-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/bval-tomee/pom.xml Tue Sep 27 06:36:17 2011
@@ -30,6 +30,10 @@
   <name>OpenEJB :: TCK :: Bean Validation TomEE</name>
   <description>Aggregates dependencies and runs the JSR-303 TCK in TomEE</description>
 
+  <properties>
+    <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.bval</groupId>
@@ -193,7 +197,7 @@
                 <replace file="${openejb.home}/conf/server.xml" token="8009" value="${tomee.ajp.port}"/>
 
                 <!-- validator provider property -->
-                <copy file="src/main/tomcat/conf/system.properties" tofile="${project.build.directory}/apache-tomee-webprofile-${project.version}/conf/system.properties"/>
+                <copy file="src/main/tomcat/conf/system.properties" tofile="${openejb.home}/conf/system.properties"/>
               </target>
             </configuration>
           </execution>
@@ -235,7 +239,7 @@
             <server.http.port>${tomee.http.port}</server.http.port>
             <server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
             <java.opts>-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m</java.opts>
-            <openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
+            <openejb.home>${openejb.home}</openejb.home>
           </systemPropertyVariables>
         </configuration>
         <executions>
@@ -257,7 +261,4 @@
       </plugin>
     </plugins>
   </build>
-  <properties>
-    <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
-  </properties>
 </project>
\ No newline at end of file

Modified: openejb/trunk/openejb3/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/tck/cdi-tomee/pom.xml?rev=1176229&r1=1176228&r2=1176229&view=diff
==============================================================================
--- openejb/trunk/openejb3/tck/cdi-tomee/pom.xml (original)
+++ openejb/trunk/openejb3/tck/cdi-tomee/pom.xml Tue Sep 27 06:36:17 2011
@@ -212,7 +212,7 @@
             <server.http.port>${tomee.http.port}</server.http.port>
             <server.shutdown.port>${tomee.shutdown.port}</server.shutdown.port>
             <java.opts>-Xmx512m -Xms256m -XX:PermSize=64m -XX:MaxPermSize=256m -XX:ReservedCodeCacheSize=64m</java.opts>
-            <openejb.home>${project.build.directory}${file.separator}apache-tomee-${project.version}</openejb.home>
+            <openejb.home>${openejb.home}</openejb.home>
           </systemPropertyVariables>
         </configuration>
         <executions>