exo-jcr SVN: r2425 - in jcr/trunk/applications: exo.jcr.applications.jonas and 1 other directories.
by do-not-reply＠jboss.org
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>
14 years
exo-jcr SVN: r2424 - in jcr/trunk/applications: exo.jcr.applications.backupconsole and 1 other directories.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-05-21 04:29:48 -0400 (Fri, 21 May 2010)
New Revision: 2424
Modified:
jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml
jcr/trunk/applications/pom.xml
Log:
EXOJCR-739 modules structure in applications reactor updated
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2010-05-21 08:27:44 UTC (rev 2423)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2010-05-21 08:29:48 UTC (rev 2424)
@@ -29,7 +29,6 @@
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
<properties>
- <exo.test.includes>*</exo.test.includes>
<childDelegation>true</childDelegation>
<enforcer.skip>true</enforcer.skip>
</properties>
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml 2010-05-21 08:27:44 UTC (rev 2423)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/src/main/assemblies/binary-assembly.xml 2010-05-21 08:29:48 UTC (rev 2424)
@@ -45,15 +45,26 @@
<include>logs/**/*</include>
</includes>
</fileSet>
- <fileSet>
+ <!--fileSet>
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
- </fileSet>
+ </fileSet-->
</fileSets>
+ <!--files>
+ <file>
+ <source/>
+ <outputDirectory/>
+ <destName/>
+ <fileMode/>
+ <lineEnding/>
+ <filtered/>
+ </file>
+ </files-->
+
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
@@ -87,4 +98,4 @@
</dependencySet>
</dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>
Modified: jcr/trunk/applications/pom.xml
===================================================================
--- jcr/trunk/applications/pom.xml 2010-05-21 08:27:44 UTC (rev 2423)
+++ jcr/trunk/applications/pom.xml 2010-05-21 08:29:48 UTC (rev 2424)
@@ -41,8 +41,8 @@
<module>exo.jcr.applications.fckeditor</module>
<module>exo.jcr.applications.rest</module>
<module>exo.jcr.ear</module>
- <module>product-exo-jcr-as-jboss-ear.xml</module>
- <module>product-exo-jcr-as-jonas-ear.xml</module>
- <module>product-exo-jcr-as-tomcat6.xml</module>
+ <module>exo.jcr.applications.jboss</module>
+ <module>exo.jcr.applications.jonas</module>
+ <module>exo.jcr.applications.tomcat</module>
</modules>
</project>
14 years
exo-jcr SVN: r2423 - in jcr/trunk/applications: exo.jcr.applications.tomcat and 1 other directory.
by do-not-reply＠jboss.org
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>
14 years
exo-jcr SVN: r2422 - jcr/trunk/applications/exo.jcr.applications.jonas.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-05-21 04:25:46 -0400 (Fri, 21 May 2010)
New Revision: 2422
Added:
jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml
Removed:
jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml
Log:
EXOJCR-739 Jonas deploy module moved to separate module.
Copied: jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml (from rev 2421, jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml)
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml (rev 0)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/pom.xml 2010-05-21 08:25:46 UTC (rev 2422)
@@ -0,0 +1,139 @@
+<!--
+
+ 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>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.jcr.applications.jonas</artifactId>
+ <packaging>pom</packaging>
+ <name>eXo JCR :: Applications :: Jonas AS</name>
+ <url>http://www.exoplatform.org</url>
+ <description>eXo JCR Jonas Applications Server</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.ear</artifactId>
+ <version>1.12.2-GA-SNAPSHOT</version>
+ <type>ear</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <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>
+ <!--copying the AS-->
+ <delete dir="${exo.projects.directory.working}/exo-jonas" includeEmptyDirs="true" quiet="yes" />
+ <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/">
+ <include name="**/*.ear" />
+ </fileset>
+ <mapper>
+ <chainedmapper>
+ <flattenmapper />
+ <globmapper from="*-${project.version}.ear" to="*.ear" casesensitive="no" />
+ </chainedmapper>
+ </mapper>
+ </move>
+ <!--copying the ear-->
+ <copy todir="${exo.projects.directory.working}/exo-jonas/apps/autoload/" verbose="true" overwrite="true">
+ <fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.ear" />
+ </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" />
+ </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="*.*" />
+ </copy>
+ <copy todir="${exo.projects.directory.working}/exo-jonas/bin/" verbose="true" overwrite="true">
+ <fileset dir="${basedir}/product-patches/as/jonas/bin/" />
+ </copy>
+ <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/">
+ <include name="**/hsqldb*.jar" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Deleted: jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml 2010-05-21 08:24:36 UTC (rev 2421)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml 2010-05-21 08:25:46 UTC (rev 2422)
@@ -1,139 +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>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>exo.jcr.applications.jonas</artifactId>
- <packaging>pom</packaging>
- <name>eXo JCR :: Applications :: Jonas AS</name>
- <url>http://www.exoplatform.org</url>
- <description>eXo JCR Jonas Applications Server</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.ear</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
- <type>ear</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <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>
- <!--copying the AS-->
- <delete dir="${exo.projects.directory.working}/exo-jonas" includeEmptyDirs="true" quiet="yes" />
- <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/">
- <include name="**/*.ear" />
- </fileset>
- <mapper>
- <chainedmapper>
- <flattenmapper />
- <globmapper from="*-${project.version}.ear" to="*.ear" casesensitive="no" />
- </chainedmapper>
- </mapper>
- </move>
- <!--copying the ear-->
- <copy todir="${exo.projects.directory.working}/exo-jonas/apps/autoload/" verbose="true" overwrite="true">
- <fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.ear" />
- </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" />
- </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="*.*" />
- </copy>
- <copy todir="${exo.projects.directory.working}/exo-jonas/bin/" verbose="true" overwrite="true">
- <fileset dir="${basedir}/product-patches/as/jonas/bin/" />
- </copy>
- <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/">
- <include name="**/hsqldb*.jar" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
14 years
exo-jcr SVN: r2421 - in jcr/trunk/applications: exo.jcr.applications.jonas and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-05-21 04:24:36 -0400 (Fri, 21 May 2010)
New Revision: 2421
Added:
jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml
Removed:
jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml
Log:
EXOJCR-739 Jonas deploy module moved to separate module.
Copied: jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml (from rev 2420, jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml)
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml (rev 0)
+++ jcr/trunk/applications/exo.jcr.applications.jonas/product-exo-jcr-as-jonas-ear.xml 2010-05-21 08:24:36 UTC (rev 2421)
@@ -0,0 +1,139 @@
+<!--
+
+ 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>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.jcr.applications.jonas</artifactId>
+ <packaging>pom</packaging>
+ <name>eXo JCR :: Applications :: Jonas AS</name>
+ <url>http://www.exoplatform.org</url>
+ <description>eXo JCR Jonas Applications Server</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.ear</artifactId>
+ <version>1.12.2-GA-SNAPSHOT</version>
+ <type>ear</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <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>
+ <!--copying the AS-->
+ <delete dir="${exo.projects.directory.working}/exo-jonas" includeEmptyDirs="true" quiet="yes" />
+ <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/">
+ <include name="**/*.ear" />
+ </fileset>
+ <mapper>
+ <chainedmapper>
+ <flattenmapper />
+ <globmapper from="*-${project.version}.ear" to="*.ear" casesensitive="no" />
+ </chainedmapper>
+ </mapper>
+ </move>
+ <!--copying the ear-->
+ <copy todir="${exo.projects.directory.working}/exo-jonas/apps/autoload/" verbose="true" overwrite="true">
+ <fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.ear" />
+ </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" />
+ </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="*.*" />
+ </copy>
+ <copy todir="${exo.projects.directory.working}/exo-jonas/bin/" verbose="true" overwrite="true">
+ <fileset dir="${basedir}/product-patches/as/jonas/bin/" />
+ </copy>
+ <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/">
+ <include name="**/hsqldb*.jar" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
Deleted: jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml 2010-05-21 08:23:09 UTC (rev 2420)
+++ jcr/trunk/applications/product-exo-jcr-as-jonas-ear.xml 2010-05-21 08:24:36 UTC (rev 2421)
@@ -1,139 +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>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>exo.jcr.applications.jonas</artifactId>
- <packaging>pom</packaging>
- <name>eXo JCR :: Applications :: Jonas AS</name>
- <url>http://www.exoplatform.org</url>
- <description>eXo JCR Jonas Applications Server</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.ear</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
- <type>ear</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <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>
- <!--copying the AS-->
- <delete dir="${exo.projects.directory.working}/exo-jonas" includeEmptyDirs="true" quiet="yes" />
- <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/">
- <include name="**/*.ear" />
- </fileset>
- <mapper>
- <chainedmapper>
- <flattenmapper />
- <globmapper from="*-${project.version}.ear" to="*.ear" casesensitive="no" />
- </chainedmapper>
- </mapper>
- </move>
- <!--copying the ear-->
- <copy todir="${exo.projects.directory.working}/exo-jonas/apps/autoload/" verbose="true" overwrite="true">
- <fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.ear" />
- </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" />
- </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="*.*" />
- </copy>
- <copy todir="${exo.projects.directory.working}/exo-jonas/bin/" verbose="true" overwrite="true">
- <fileset dir="${basedir}/product-patches/as/jonas/bin/" />
- </copy>
- <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/">
- <include name="**/hsqldb*.jar" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
14 years
exo-jcr SVN: r2420 - in jcr/trunk/applications: exo.jcr.applications.jboss and 1 other directory.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-05-21 04:23:09 -0400 (Fri, 21 May 2010)
New Revision: 2420
Added:
jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml
Removed:
jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml
Log:
EXOJCR-739 JBoss deploy module moved to separate module.
Copied: jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml (from rev 2419, jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml)
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml (rev 0)
+++ jcr/trunk/applications/exo.jcr.applications.jboss/pom.xml 2010-05-21 08:23:09 UTC (rev 2420)
@@ -0,0 +1,138 @@
+<!--
+
+ 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>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>exo.jcr.applications.jboss</artifactId>
+ <packaging>pom</packaging>
+ <name>eXo JCR :: Applications :: JBoss AS</name>
+ <url>http://www.exoplatform.org</url>
+ <description>eXo JCR JBoss Applications Server</description>
+
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.exoplatform.jcr</groupId>
+ <artifactId>exo.jcr.ear</artifactId>
+ <version>1.12.2-GA-SNAPSHOT</version>
+ <type>ear</type>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <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>
+ <!--copying the AS-->
+ <delete dir="${exo.projects.directory.working}/exo-jboss" includeEmptyDirs="true" quiet="yes" />
+ <copy todir="${exo.projects.directory.working}/exo-jboss" verbose="false" overwrite="true">
+ <fileset dir="${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}" />
+ </copy>
+ <!--renaming ear-->
+ <move todir="${basedir}/target/lib-binary.dir/">
+ <fileset dir="${basedir}/target/lib-binary.dir/">
+ <include name="**/*.ear" />
+ </fileset>
+ <mapper>
+ <chainedmapper>
+ <flattenmapper />
+ <globmapper from="*-${project.version}.ear" to="*.ear" casesensitive="no" />
+ </chainedmapper>
+ </mapper>
+ </move>
+ <!--copying the ear-->
+ <copy todir="${exo.projects.directory.working}/exo-jboss/server/default/deploy/" verbose="true" overwrite="true">
+ <fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.ear" />
+ </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" />
+ </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" />
+ </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>
+ </profile>
+ </profiles>
+
+
+</project>
Deleted: jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml 2010-05-21 08:20:01 UTC (rev 2419)
+++ jcr/trunk/applications/product-exo-jcr-as-jboss-ear.xml 2010-05-21 08:23:09 UTC (rev 2420)
@@ -1,138 +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>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>exo.jcr.applications.jboss</artifactId>
- <packaging>pom</packaging>
- <name>eXo JCR :: Applications :: JBoss AS</name>
- <url>http://www.exoplatform.org</url>
- <description>eXo JCR JBoss Applications Server</description>
-
- <properties>
- <enforcer.skip>true</enforcer.skip>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.jcr</groupId>
- <artifactId>exo.jcr.ear</artifactId>
- <version>1.12.2-GA-SNAPSHOT</version>
- <type>ear</type>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <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>
- <!--copying the AS-->
- <delete dir="${exo.projects.directory.working}/exo-jboss" includeEmptyDirs="true" quiet="yes" />
- <copy todir="${exo.projects.directory.working}/exo-jboss" verbose="false" overwrite="true">
- <fileset dir="${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}" />
- </copy>
- <!--renaming ear-->
- <move todir="${basedir}/target/lib-binary.dir/">
- <fileset dir="${basedir}/target/lib-binary.dir/">
- <include name="**/*.ear" />
- </fileset>
- <mapper>
- <chainedmapper>
- <flattenmapper />
- <globmapper from="*-${project.version}.ear" to="*.ear" casesensitive="no" />
- </chainedmapper>
- </mapper>
- </move>
- <!--copying the ear-->
- <copy todir="${exo.projects.directory.working}/exo-jboss/server/default/deploy/" verbose="true" overwrite="true">
- <fileset dir="${basedir}/target/lib-binary.dir/" includes="**/*.ear" />
- </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" />
- </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" />
- </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>
- </profile>
- </profiles>
-
-
-</project>
14 years
exo-jcr SVN: r2419 - jcr/trunk/applications.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-05-21 04:20:01 -0400 (Fri, 21 May 2010)
New Revision: 2419
Added:
jcr/trunk/applications/exo.jcr.applications.jboss/
jcr/trunk/applications/exo.jcr.applications.jonas/
jcr/trunk/applications/exo.jcr.applications.tomcat/
Log:
EXOJCR-739 folders for application servers deploying modules added
14 years
exo-jcr SVN: r2418 - kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming.
by do-not-reply＠jboss.org
Author: pnedonosko
Date: 2010-05-21 04:19:48 -0400 (Fri, 21 May 2010)
New Revision: 2418
Modified:
kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
Log:
EXOJCR-573: log.debug in bind method
Modified: kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java
===================================================================
--- kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2010-05-21 08:17:56 UTC (rev 2417)
+++ kernel/trunk/exo.kernel.component.common/src/main/java/org/exoplatform/services/naming/InitialContextInitializer.java 2010-05-21 08:19:48 UTC (rev 2418)
@@ -54,7 +54,7 @@
final public static String PROPERTIES_MANDATORY = "mandatory-properties";
- private static Log log = ExoLogger.getLogger("exo.kernel.component.common.InitialContextInitializer");
+ private static Log LOG = ExoLogger.getLogger("exo.kernel.component.common.InitialContextInitializer");
private List<BindReferencePlugin> bindReferencesPlugins;
@@ -98,7 +98,7 @@
}
else
{
- log.info("Using default system property: " + propName + " = " + existedProp);
+ LOG.info("Using default system property: " + propName + " = " + existedProp);
}
}
}
@@ -117,11 +117,12 @@
{
defaultContextFactory = propValue;
}
- log.info("Using mandatory system property: " + propName + " = " + System.getProperty(propName));
+ LOG.info("Using mandatory system property: " + propName + " = " + System.getProperty(propName));
}
// for out-of-container testing
- private InitialContextInitializer(String name, Reference reference) throws NamingException, FileNotFoundException, XMLStreamException
+ private InitialContextInitializer(String name, Reference reference) throws NamingException, FileNotFoundException,
+ XMLStreamException
{
if (System.getProperty(Context.INITIAL_CONTEXT_FACTORY) == null)
{
@@ -147,15 +148,15 @@
{
InitialContext ic = new InitialContext();
ic.bind(plugin.getBindName(), plugin.getReference());
- log.info("Reference bound (by recall()): " + plugin.getBindName());
+ LOG.info("Reference bound (by recall()): " + plugin.getBindName());
}
catch (NameAlreadyBoundException e)
{
- log.debug("Name already bound: " + plugin.getBindName());
+ LOG.debug("Name already bound: " + plugin.getBindName());
}
catch (NamingException e)
{
- log.error("Could not bind: " + plugin.getBindName(), e);
+ LOG.error("Could not bind: " + plugin.getBindName(), e);
}
}
}
@@ -169,12 +170,12 @@
{
// initialContext = new InitialContext();
initialContext.rebind(brplugin.getBindName(), brplugin.getReference());
- log.info("Reference bound: " + brplugin.getBindName());
+ LOG.info("Reference bound: " + brplugin.getBindName());
bindReferencesPlugins.add((BindReferencePlugin)plugin);
}
catch (NamingException e)
{
- log.error("Could not bind: " + brplugin.getBindName(), e);
+ LOG.error("Could not bind: " + brplugin.getBindName(), e);
}
}
}
@@ -206,7 +207,8 @@
}
// for out-of-container testing
- public static void initialize(String name, Reference reference) throws NamingException, FileNotFoundException, XMLStreamException
+ public static void initialize(String name, Reference reference) throws NamingException, FileNotFoundException,
+ XMLStreamException
{
new InitialContextInitializer(name, reference);
}
@@ -234,6 +236,19 @@
public void bind(String bindName, String className, String factory, String factoryLocation,
Map<String, String> refAddr) throws NamingException, FileNotFoundException, XMLStreamException
{
+ if (LOG.isDebugEnabled())
+ {
+ StringBuilder refAddrString = new StringBuilder();
+ for (Map.Entry<String, String> ent: refAddr.entrySet()) {
+ refAddrString.append(ent.getKey());
+ refAddrString.append('=');
+ refAddrString.append(ent.getValue());
+ refAddrString.append(';');
+ }
+ LOG.debug("Bind: " + bindName + " class-name:" + className + " factory:" + factory + " factoryLocation:" + factoryLocation +
+ " refAddr:" + refAddrString);
+ }
+
binder.bind(bindName, className, factory, factoryLocation, refAddr);
}
}
14 years
exo-jcr SVN: r2417 - jcr/trunk/applications.
by do-not-reply＠jboss.org
Author: dkatayev
Date: 2010-05-21 04:17:56 -0400 (Fri, 21 May 2010)
New Revision: 2417
Modified:
jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml
Log:
EXOJCR-739 packaging changed to pom
Modified: jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml
===================================================================
--- jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml 2010-05-21 06:39:11 UTC (rev 2416)
+++ jcr/trunk/applications/product-exo-jcr-as-tomcat6.xml 2010-05-21 08:17:56 UTC (rev 2417)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.jcrapplications.tomcat</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<name>eXo JCR :: Applications :: Tomcat AS</name>
<url>http://www.exoplatform.org</url>
<description>eXo JCR Tomcat Applications Server</description>
14 years
exo-jcr SVN: r2416 - jcr/trunk/applications/exo.jcr.applications.backupconsole.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-05-21 02:39:11 -0400 (Fri, 21 May 2010)
New Revision: 2416
Modified:
jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
Log:
EXOJCR-737 : Fix dependency to backupconsol.
Modified: jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2010-05-20 13:55:28 UTC (rev 2415)
+++ jcr/trunk/applications/exo.jcr.applications.backupconsole/pom.xml 2010-05-21 06:39:11 UTC (rev 2416)
@@ -59,6 +59,10 @@
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
14 years