[gatein-commits] gatein SVN: r446 - in portal/trunk/packaging: pkg and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Oct 29 21:41:55 EDT 2009


Author: dbaeli
Date: 2009-10-29 21:41:55 -0400 (Thu, 29 Oct 2009)
New Revision: 446

Added:
   portal/trunk/packaging/profiles.xml.template
Modified:
   portal/trunk/packaging/pkg/pom.xml
   portal/trunk/packaging/profiles.xml
Log:
GTNPORTAL- : Packaging, specify a directory to install the server
[jira.jboss.org was not accessible, issue to create and commit log to change]
DESCRIPTION:
* Currently the Tomcat or JBoss installation directory is packaging/pkg/target/<server>
* We need to be able to specify a place to replace this
EXPECTED:
* Use a gatein.working.dir property with ${basedir}/target as default value
* This property can be setup in a profile to define another directory

Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml	2009-10-29 20:08:30 UTC (rev 445)
+++ portal/trunk/packaging/pkg/pom.xml	2009-10-30 01:41:55 UTC (rev 446)
@@ -138,6 +138,10 @@
      </plugins>
    </build>
 
+   <properties>
+   		<gatein.working.dir>${basedir}/target</gatein.working.dir><!-- Default value for server installation dir -->
+   </properties>
+
    <profiles>
       <profile>
          <id>pkg-tomcat</id>
@@ -192,7 +196,7 @@
                               <argument>-Dexo.current.dir=${basedir}</argument>
                               <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument>
                               <argument>-Dexo.conf.dir=${basedir}/target/exopackage-conf</argument>
-                              <argument>-Dexo.working.dir=${basedir}/target</argument>
+                              <argument>-Dexo.working.dir=${gatein.working.dir}/</argument>
                               <!--argument>-Dexo.src.dir=NONE</argument-->
                               <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
                               <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
@@ -216,6 +220,7 @@
                      </execution>
                   </executions>
                </plugin>
+<!--
                <plugin>
                   <artifactId>maven-assembly-plugin</artifactId>
                   <executions>
@@ -234,6 +239,7 @@
                      </execution>
                   </executions>
                </plugin>
+-->
             </plugins>
          </build>
       </profile>
@@ -291,7 +297,7 @@
                               <argument>-Dexo.current.dir=${basedir}</argument>
                               <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument>
                               <argument>-Dexo.conf.dir=${basedir}/target/exopackage-conf</argument>
-                              <argument>-Dexo.working.dir=${basedir}/target</argument>
+                              <argument>-Dexo.working.dir=${gatein.working.dir}</argument>
                               <!--argument>-Dexo.src.dir=NONE</argument-->
                               <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
                               <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
@@ -315,6 +321,7 @@
                      </execution>
                   </executions>
                </plugin>
+<!--
                <plugin>
                   <artifactId>maven-assembly-plugin</artifactId>
                   <executions>
@@ -333,6 +340,7 @@
                      </execution>
                   </executions>
                </plugin>
+-->
             </plugins>
          </build>
       </profile>

Modified: portal/trunk/packaging/profiles.xml
===================================================================
--- portal/trunk/packaging/profiles.xml	2009-10-29 20:08:30 UTC (rev 445)
+++ portal/trunk/packaging/profiles.xml	2009-10-30 01:41:55 UTC (rev 446)
@@ -22,18 +22,20 @@
 <profilesXml>
   <profiles>
     <profile>
-      <id>exo-projects</id>
+      <id>gatein-projects</id>
       <properties>
         <!-- 
              Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found
              ex: On Windows 'c:/AS'
              ex: On Linux '/home/user/AS'
         -->
-        <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>
+        <exo.projects.directory.dependencies>c:/ExoPlatform/src/exo-dependencies</exo.projects.directory.dependencies> 
+        
+        <gatein.working.dir>c:/ExoPlatform/src/exo-working</gatein.working.dir>
         <!--
              Replace with the name of the directory containing Tomcat 6
         -->        
-        <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
+        <exo.projects.app.tomcat.version>tomcat-6.0.20</exo.projects.app.tomcat.version>
         <!--
              Replace with the name of the directory containing JBoss AS 5.1
         -->
@@ -43,6 +45,6 @@
   </profiles>
 
   <activeProfiles>
-    <activeProfile>exo-projects</activeProfile>
+    <activeProfile>gatein-projects</activeProfile>
   </activeProfiles>
 </profilesXml>

Added: portal/trunk/packaging/profiles.xml.template
===================================================================
--- portal/trunk/packaging/profiles.xml.template	                        (rev 0)
+++ portal/trunk/packaging/profiles.xml.template	2009-10-30 01:41:55 UTC (rev 446)
@@ -0,0 +1,57 @@
+<!--
+
+    Copyright (C) 2009 eXo Platform SAS.
+    
+    This is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1 of
+    the License, or (at your option) any later version.
+    
+    This software is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+    
+    You should have received a copy of the GNU Lesser General Public
+    License along with this software; if not, write to the Free
+    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+    02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<profilesXml>
+  <profiles>
+    <profile>
+      <id>gatein-projects</id>
+      <properties>
+        <!-- 
+             Replace with the directory where uncompressed Tomcat 6 and/or JBoss 5.1 can be found
+             ex: On Windows 'c:/AS'
+             ex: On Linux '/home/user/AS'
+        -->
+        <exo.projects.directory.dependencies>REPLACE_WITH_YOUR_OWN_DIRECTORY</exo.projects.directory.dependencies>
+
+        <!-- 
+             If you want that the server is deployed always at the same place (not in packaging/pkg/target/<server> dir)
+             Uncomment and Replace with the directory you prefer
+        -->
+        <!-- 
+            <gatein.working.dir>REPLACE_WITH_SERVER_DIR</gatein.working.dir>
+        -->
+
+        <!--
+             Replace with the name of the directory containing Tomcat 6
+        -->        
+        <exo.projects.app.tomcat.version>apache-tomcat-6.0.20</exo.projects.app.tomcat.version>
+        <!--
+             Replace with the name of the directory containing JBoss AS 5.1
+        -->
+        <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version>
+      </properties>
+    </profile>
+  </profiles>
+
+  <activeProfiles>
+    <activeProfile>gatein-projects</activeProfile>
+  </activeProfiles>
+</profilesXml>



More information about the gatein-commits mailing list