Author: dkatayev
Date: 2010-05-21 04:27:44 -0400 (Fri, 21 May 2010)
New Revision: 2423
Added:
jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
Removed:
jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml
Log:
EXOJCR-739 Tomcat deploy module moved to separate module.
Copied: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml (from rev 2422,
jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml)
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml
(rev 0)
+++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-05-21 08:27:44 UTC
(rev 2423)
@@ -0,0 +1,131 @@
+<!--
+
+ 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.
+
+-->
+<project>
+ <parent>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.applications.config</artifactId>
+ <version>1.12.2-GA-SNAPSHOT</version>
+ <relativePath>exo.jcr.applications.config</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.jcrapplications.tomcat</artifactId>
+ <packaging>pom</packaging>
+ <name>eXo JCR :: Applications :: Tomcat AS</name>
+ <url>http://www.exoplatform.org</url>
+ <description>eXo JCR Tomcat Applications Server</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <descriptors>
+ <descriptor>product-exo-jcr-as-descriptor.xml</descriptor>
+ </descriptors>
+ <finalName>lib</finalName>
+ <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <tasks>
+ <delete>
+ <fileset dir="${basedir}/target/lib-binary.dir/">
+ <include name="ejb*.jar" />
+ <include name="jetty*.jar" />
+ </fileset>
+ </delete>
+ <delete dir="${exo.projects.directory.working}/exo-tomcat"
includeEmptyDirs="true" quiet="yes" />
+ <copy todir="${exo.projects.directory.working}/exo-tomcat"
verbose="false" overwrite="true">
+ <fileset
dir="${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"
/>
+ </copy>
+ <copy
todir="${exo.projects.directory.working}/exo-tomcat/lib/"
verbose="true" overwrite="true">
+ <fileset dir="${basedir}/target/lib-binary.dir/"
excludes="**/*.war" />
+ </copy>
+ <copy
todir="${exo.projects.directory.working}/exo-tomcat/" verbose="true"
overwrite="true">
+ <fileset dir="${basedir}/product-patches/as/tomcat/"
/>
+ </copy>
+ <move todir="${basedir}/target/lib-binary.dir/">
+ <fileset dir="${basedir}/target/lib-binary.dir/">
+ <include name="**/*.war" />
+ </fileset>
+ <mapper>
+ <chainedmapper>
+ <flattenmapper />
+ <globmapper
from="exo.jcr.applications.*-${project.version}.war" to="*.war"
casesensitive="no" />
+ </chainedmapper>
+ </mapper>
+ </move>
+ <copy
todir="${exo.projects.directory.working}/exo-tomcat/webapps/"
verbose="true" flatten="true" overwrite="true">
+ <fileset dir="${basedir}/target/lib-binary.dir/"
casesensitive="yes">
+ <include name="**/*.war" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Deleted: jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml 2010-05-21 08:25:46 UTC (rev
2422)
+++ jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml 2010-05-21 08:27:44 UTC (rev
2423)
@@ -1,131 +0,0 @@
-<!--
-
- 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.
-
--->
-<project>
- <parent>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
- <relativePath>exo.jcr.applications.config</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>exo.jcrapplications.tomcat</artifactId>
- <packaging>pom</packaging>
- <name>eXo JCR :: Applications :: Tomcat AS</name>
- <url>http://www.exoplatform.org</url>
- <description>eXo JCR Tomcat Applications Server</description>
-
- <dependencies>
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
- </properties>
-
- <profiles>
- <profile>
- <id>deploy</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <descriptors>
- <descriptor>product-exo-jcr-as-descriptor.xml</descriptor>
- </descriptors>
- <finalName>lib</finalName>
- <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <tasks>
- <delete>
- <fileset dir="${basedir}/target/lib-binary.dir/">
- <include name="ejb*.jar" />
- <include name="jetty*.jar" />
- </fileset>
- </delete>
- <delete dir="${exo.projects.directory.working}/exo-tomcat"
includeEmptyDirs="true" quiet="yes" />
- <copy todir="${exo.projects.directory.working}/exo-tomcat"
verbose="false" overwrite="true">
- <fileset
dir="${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"
/>
- </copy>
- <copy
todir="${exo.projects.directory.working}/exo-tomcat/lib/"
verbose="true" overwrite="true">
- <fileset dir="${basedir}/target/lib-binary.dir/"
excludes="**/*.war" />
- </copy>
- <copy
todir="${exo.projects.directory.working}/exo-tomcat/" verbose="true"
overwrite="true">
- <fileset dir="${basedir}/product-patches/as/tomcat/"
/>
- </copy>
- <move todir="${basedir}/target/lib-binary.dir/">
- <fileset dir="${basedir}/target/lib-binary.dir/">
- <include name="**/*.war" />
- </fileset>
- <mapper>
- <chainedmapper>
- <flattenmapper />
- <globmapper
from="exo.jcr.applications.*-${project.version}.war" to="*.war"
casesensitive="no" />
- </chainedmapper>
- </mapper>
- </move>
- <copy
todir="${exo.projects.directory.working}/exo-tomcat/webapps/"
verbose="true" flatten="true" overwrite="true">
- <fileset dir="${basedir}/target/lib-binary.dir/"
casesensitive="yes">
- <include name="**/*.war" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>