Revision: 22773
Author:   pavel.slegr
Date:     Thu Jul 26 08:01:22 2012
Log:      add jboss5-exposed to build chain
http://code.google.com/p/mobicents/source/detail?r=22773

Modified:
 /branches/jbcp/5.1.x/build/build-MSS.xml
 /branches/jbcp/5.1.x/jbossweb-5-exposed/common-lib/pom.xml
 /branches/jbcp/5.1.x/jbossweb-5-exposed/jbossweb.sar/pom.xml
 /branches/jbcp/5.1.x/jbossweb-5-exposed/pom.xml
 /branches/jbcp/5.1.x/sip-servlets/sip-servlets-jboss5/pom.xml
/branches/jbcp/5.1.x/sip-servlets/sip-servlets-jboss5-ha-server-cache/pom.xml

=======================================
--- /branches/jbcp/5.1.x/build/build-MSS.xml    Mon Jun 18 23:48:58 2012
+++ /branches/jbcp/5.1.x/build/build-MSS.xml    Thu Jul 26 08:01:22 2012
@@ -109,10 +109,10 @@
                <!--antcall target="build-jdiameter" />
                <antcall target="build-jdiameter-ha" />
                <antcall target="build-diameter-mux" /-->
+               <antcall target="build-jbossweb-5-exposed-libs" />
                <antcall target="build-sip-servlets" />
                <antcall target="build-sip-servlets-jopr" />
                <antcall target="build-sip-servlets-management" />
-               <antcall target="copy-jbossweb-5-exposed-libs" />
        </target>


@@ -448,6 +448,7 @@


        </target>
+
        <!-- ========================== -->
        <!-- components build targets -->
        <!-- ========================== -->
@@ -529,6 +530,14 @@
                        <arg line="clean install -P validate-source-headers" />
                </exec>
        </target>
+
+       <!--Jboss-5-exposed-web-libs-->
+       <target name="build-jbossweb-5-exposed-libs">
+ <exec executable="${mvn.executable}" dir="${ant.file.jbcp5.local.build}/../../jbossweb-5-exposed"> + <arg line="clean install -P validate-source-headers -Denv.JBOSS_HOME=${jboss.home} -Dnode=${jboss.node}" />
+               </exec>
+       </target>
+

        <!-- Sip Servlets -->

@@ -585,18 +594,11 @@
                <tstamp>
                        <format property="time.stamp" pattern="yyMMddHHmm" />
                </tstamp>
-       </target>
-
+       </target>
+
        <!-- clean build process -->
        <target name="clean">
                <delete dir="${build.dir}" />
                <delete dir="${docs.stage.dir}" />
        </target>
-
-       <target name="copy-jbossweb-5-exposed-libs">
-               <echo>Copying signed JBoss Web 5 Exposed Libs</echo>
- <copy overwrite="true" verbose="true" file="${ant.file.jbcp.platform.release}/../lib/jbossweb-5-exposed-common-lib-1.0.jar" todir="${jboss.home}/common/lib" /> - <copy overwrite="true" verbose="true" file="${ant.file.jbcp.platform.release}/../lib/jbossweb-5-exposed-jbossweb.sar-1.0.jar" todir="${jboss.home}/server/${jboss.node}/deploy/jbossweb.sar" />
-       </target>
-
 </project>
=======================================
--- /branches/jbcp/5.1.x/jbossweb-5-exposed/common-lib/pom.xml Thu May 3 04:25:01 2012 +++ /branches/jbcp/5.1.x/jbossweb-5-exposed/common-lib/pom.xml Thu Jul 26 08:01:22 2012
@@ -5,7 +5,7 @@
        <parent>
                <groupId>com.redhat.jbcp</groupId>
                <artifactId>jbossweb-5-exposed</artifactId>
-               <version>1.0</version>
+               <version>5.1.4.GA-JBCP5_1</version>
        </parent>

        <artifactId>jbossweb-5-exposed-common-lib</artifactId>
@@ -19,4 +19,28 @@
                </dependency>
        </dependencies>

+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-antrun-plugin</artifactId>
+                               <version>1.1</version>
+                               <executions>
+                                       <execution>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <tasks>
+ <copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/common/lib" />
+                                                       </tasks>
+                                               </configuration>
+                                               <goals>
+                                                       <goal>run</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+
+
 </project>
=======================================
--- /branches/jbcp/5.1.x/jbossweb-5-exposed/jbossweb.sar/pom.xml Thu May 3 04:25:01 2012 +++ /branches/jbcp/5.1.x/jbossweb-5-exposed/jbossweb.sar/pom.xml Thu Jul 26 08:01:22 2012
@@ -5,7 +5,7 @@
        <parent>
                <groupId>com.redhat.jbcp</groupId>
                <artifactId>jbossweb-5-exposed</artifactId>
-               <version>1.0</version>
+               <version>5.1.4.GA-JBCP5_1</version>
        </parent>

        <artifactId>jbossweb-5-exposed-jbossweb.sar</artifactId>
@@ -24,4 +24,28 @@
                </dependency>
        </dependencies>

+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-antrun-plugin</artifactId>
+                               <version>1.1</version>
+                               <executions>
+                                       <execution>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <tasks>
+ <copy verbose="true" file="${project.build.directory}/${project.build.finalName}.${project.packaging}" todir="${env.JBOSS_HOME}/server/${node}/deploy/jbossweb.sar/" />
+                                                       </tasks>
+                                               </configuration>
+                                               <goals>
+                                                       <goal>run</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+
+
 </project>
=======================================
--- /branches/jbcp/5.1.x/jbossweb-5-exposed/pom.xml     Thu May  3 04:25:01 2012
+++ /branches/jbcp/5.1.x/jbossweb-5-exposed/pom.xml     Thu Jul 26 08:01:22 2012
@@ -10,7 +10,7 @@

        <groupId>com.redhat.jbcp</groupId>
        <artifactId>jbossweb-5-exposed</artifactId>
-       <version>1.0</version>
+       <version>5.1.4.GA-JBCP5_1</version>

        <packaging>pom</packaging>

=======================================
--- /branches/jbcp/5.1.x/sip-servlets/sip-servlets-jboss5/pom.xml Tue May 29 02:56:35 2012 +++ /branches/jbcp/5.1.x/sip-servlets/sip-servlets-jboss5/pom.xml Thu Jul 26 08:01:22 2012
@@ -34,7 +34,7 @@
                <dependency>
                        <groupId>com.redhat.jbcp</groupId>
                        <artifactId>jbossweb-5-exposed-jbossweb.sar</artifactId>
-                       <version>1.0</version>
+                       <version>5.1.4.GA-JBCP5_1</version>
                        <scope>provided</scope>
                </dependency>

=======================================
--- /branches/jbcp/5.1.x/sip-servlets/sip-servlets-jboss5-ha-server-cache/pom.xml Tue May 29 02:56:35 2012 +++ /branches/jbcp/5.1.x/sip-servlets/sip-servlets-jboss5-ha-server-cache/pom.xml Thu Jul 26 08:01:22 2012
@@ -20,7 +20,7 @@
                <dependency>
                        <groupId>com.redhat.jbcp</groupId>
                        <artifactId>jbossweb-5-exposed-common-lib</artifactId>
-                       <version>1.0</version>
+                       <version>5.1.4.GA-JBCP5_1</version>
                        <scope>provided</scope>
                </dependency>

Reply via email to