[exo-jcr-commits] exo-jcr SVN: r2425 - in jcr/trunk/applications: exo.jcr.applications.jonas and 1 other directories.

Author: dkatayev Date: 2010-05-21 05:19:35 -0400 (Fri, 21 May 2010) New Revision: 2425 Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml Log: EXOJCR-739 permissions for execution are added to unix scripts aitomatically Modified: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2010-05-21 08:29:48 UTC (rev 2424) +++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2010-05-21 09:19:35 UTC (rev 2425) @@ -53,10 +53,10 @@ </dependencies> <profiles> - <profile> - <id>deploy</id> + <profile> + <id>deploy</id> <activation> - <activeByDefault>false</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> <build> <plugins> @@ -72,7 +72,7 @@ </executions> <configuration> <descriptors> - <descriptor>product-exo-jcr-as-descriptor.xml</descriptor> + <descriptor>../product-exo-jcr-as-descriptor.xml</descriptor> </descriptors> <finalName>lib</finalName> <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions> @@ -95,6 +95,8 @@ <copy todir="${exo.projects.directory.working}/exo-jboss" verbose="false" overwrite="true"> <fileset dir="${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}" /> </copy> + <chmod dir="${exo.projects.directory.working}/exo-jboss/bin" perm="+x" includes="*.sh"/> + <!--renaming ear--> <move todir="${basedir}/target/lib-binary.dir/"> <fileset dir="${basedir}/target/lib-binary.dir/"> @@ -113,24 +115,16 @@ </copy> <!--copying exo-configuration.xml--> <copy todir="${exo.projects.directory.working}/exo-jboss/" verbose="true" overwrite="true"> - <fileset dir="${basedir}/product-patches/as/jboss/" includes="*.xml" /> + <fileset dir="${basedir}/../product-patches/as/jboss/" includes="*.xml" /> </copy> <copy todir="${exo.projects.directory.working}/exo-jboss/server/default/conf/" verbose="true" overwrite="true"> - <fileset dir="${basedir}/product-patches/as/jboss/exoplatform.sar/META-INF/" includes="login*.xml" /> + <fileset dir="${basedir}/../product-patches/as/jboss/exoplatform.sar/META-INF/" includes="login*.xml" /> </copy> - <!-- we don't need it for JBossAS 5.1 --> - <!-- delete file="${exo.projects.directory.working}/exo-jboss/server/default/lib/hsqldb.jar" /> - <copy todir="${exo.projects.directory.working}/exo-jboss/server/default/lib/"> - <fileset dir="${basedir}/target/lib-binary.dir/"> - <include name="**/hsqldb*.jar" /> - </fileset> - </copy ---> </tasks> </configuration> </plugin> </plugins> - </build> + </build> </profile> </profiles> Modified: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2010-05-21 08:29:48 UTC (rev 2424) +++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2010-05-21 09:19:35 UTC (rev 2425) @@ -53,10 +53,10 @@ </dependencies> <profiles> - <profile> - <id>deploy</id> + <profile> + <id>deploy</id> <activation> - <activeByDefault>false</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> <build> <plugins> @@ -72,7 +72,7 @@ </executions> <configuration> <descriptors> - <descriptor>product-exo-jcr-as-descriptor.xml</descriptor> + <descriptor>../product-exo-jcr-as-descriptor.xml</descriptor> </descriptors> <finalName>lib</finalName> <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions> @@ -95,6 +95,7 @@ <copy todir="${exo.projects.directory.working}/exo-jonas" verbose="false" overwrite="true"> <fileset dir="${exo.projects.directory.dependencies}/${exo.projects.app.jonas.version}" /> </copy> + <!--renaming ear--> <move todir="${basedir}/target/lib-binary.dir/"> <fileset dir="${basedir}/target/lib-binary.dir/"> @@ -113,15 +114,16 @@ </copy> <!--copying exo-configuration.xml--> <copy todir="${exo.projects.directory.working}/exo-jonas/" verbose="true" overwrite="true"> - <fileset dir="${basedir}/product-patches/as/jonas/" includes="*.xml" /> + <fileset dir="${basedir}/../product-patches/as/jonas/" includes="*.xml" /> </copy> <!--copying jaas.config etc.--> <copy todir="${exo.projects.directory.working}/exo-jonas/conf/" verbose="true" overwrite="true"> - <fileset dir="${basedir}/product-patches/as/jonas/conf/" includes="*.*" /> + <fileset dir="${basedir}/../product-patches/as/jonas/conf/" includes="*.*" /> </copy> <copy todir="${exo.projects.directory.working}/exo-jonas/bin/" verbose="true" overwrite="true"> - <fileset dir="${basedir}/product-patches/as/jonas/bin/" /> - </copy> + <fileset dir="${basedir}/../product-patches/as/jonas/bin/" /> + </copy> + <chmod dir="${exo.projects.directory.working}/exo-jonas/bin/unix" perm="+x" includes="*"/> <delete file="${exo.projects.directory.working}/exo-jonas/lib/commons/jonas/hsqldb.jar" /> <copy todir="${exo.projects.directory.working}/exo-jonas/lib/commons/jonas/"> <fileset dir="${basedir}/target/lib-binary.dir/"> @@ -132,7 +134,7 @@ </configuration> </plugin> </plugins> - </build> + </build> </profile> </profiles> Modified: jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml =================================================================== --- jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-05-21 08:29:48 UTC (rev 2424) +++ jcr/trunk/applications/exo.jcr.applications.tomcat/pom.xml 2010-05-21 09:19:35 UTC (rev 2425) @@ -51,10 +51,10 @@ </properties> <profiles> - <profile> - <id>deploy</id> + <profile> + <id>deploy</id> <activation> - <activeByDefault>false</activeByDefault> + <activeByDefault>false</activeByDefault> </activation> <build> <plugins> @@ -70,7 +70,7 @@ </executions> <configuration> <descriptors> - <descriptor>product-exo-jcr-as-descriptor.xml</descriptor> + <descriptor>../product-exo-jcr-as-descriptor.xml</descriptor> </descriptors> <finalName>lib</finalName> <ignoreDirFormatExtensions>false</ignoreDirFormatExtensions> @@ -102,8 +102,10 @@ <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/" /> + <fileset dir="${basedir}/../product-patches/as/tomcat/" /> </copy> + <chmod dir="${exo.projects.directory.working}/exo-tomcat/bin" perm="+x" includes="*.sh"/> + <move todir="${basedir}/target/lib-binary.dir/"> <fileset dir="${basedir}/target/lib-binary.dir/"> <include name="**/*.war" /> @@ -124,7 +126,7 @@ </configuration> </plugin> </plugins> - </build> + </build> </profile> </profiles>