[gatein-commits] gatein SVN: r4807 - in portal/trunk/packaging/tomcat/pkg: src/assembly and 1 other directory.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-10-23 18:31:46 -0400 (Sat, 23 Oct 2010)
New Revision: 4807

Modified:
   portal/trunk/packaging/tomcat/pkg/pom.xml
   portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml
Log:
update for maven3 


Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml	2010-10-23 21:55:37 UTC (rev 4806)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml	2010-10-23 22:31:46 UTC (rev 4807)
@@ -864,7 +864,7 @@
           <finalName>tomcat</finalName>
           <appendAssemblyId>false</appendAssemblyId>
         </configuration>
-        <version>2.2-beta-5</version>
+        <version>2.2</version>
         <executions>
           <execution>
             <id>init-assembly</id>

Modified: portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml	2010-10-23 21:55:37 UTC (rev 4806)
+++ portal/trunk/packaging/tomcat/pkg/src/assembly/tomcat-init.xml	2010-10-23 22:31:46 UTC (rev 4807)
@@ -161,10 +161,6 @@
 
   <fileSets>
 
-    <fileSet>
-
-    </fileSet>
-
     <!-- Copy tomcat: without unix executables -->
     <fileSet>
       <directory>${tomcat.dir}</directory>
@@ -193,7 +189,7 @@
 
     <!-- Configurations, etc.-->
     <fileSet>
-      <directory>${basedir}/src/main/resources/tomcat</directory>
+      <directory>${project.basedir}/src/main/resources/tomcat</directory>
       <outputDirectory>tomcat</outputDirectory>
       <excludes>
         <exclude>bin/*.sh</exclude>
@@ -203,7 +199,7 @@
 
     <!-- Startup scripts -->
     <fileSet>
-      <directory>${basedir}/src/main/resources/tomcat/bin</directory>
+      <directory>${project.basedir}/src/main/resources/tomcat/bin</directory>
       <outputDirectory>tomcat/bin</outputDirectory>
       <includes>
         <include>*.sh</include>
@@ -214,10 +210,11 @@
 
   <files>
     <!-- Copy gatein configuration file -->
+    <!-- Julien : try to improve that -->
     <file>
-    <source>${basedir}/../../../component/common/src/main/java/conf/configuration-tomcat.properties</source>
-    <outputDirectory>tomcat/gatein/conf</outputDirectory>
-    <destName>configuration.properties</destName>
+      <source>${project.basedir}/../../../component/common/src/main/java/conf/configuration-tomcat.properties</source>
+      <outputDirectory>tomcat/gatein/conf</outputDirectory>
+      <destName>configuration.properties</destName>
     </file>
   </files>