[jboss-svn-commits] JBL Code SVN: r11818 - in labs/jbossforums/branches/forums22: forums/src/resources/portal-forums-ear/META-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2007-05-10 14:56:30 -0400 (Thu, 10 May 2007)
New Revision: 11818

Modified:
   labs/jbossforums/branches/forums22/authz-jaae-plugin/build.xml
   labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
Log:
[JBFORUMS-204] I added Luca's patch to authorization plugin build and I reorganized build a bit.

Modified: labs/jbossforums/branches/forums22/authz-jaae-plugin/build.xml
===================================================================
--- labs/jbossforums/branches/forums22/authz-jaae-plugin/build.xml	2007-05-10 18:44:29 UTC (rev 11817)
+++ labs/jbossforums/branches/forums22/authz-jaae-plugin/build.xml	2007-05-10 18:56:30 UTC (rev 11818)
@@ -38,6 +38,8 @@
    &tools;
    &targets;
 
+   
+         
    <!-- ================================================================== -->
    <!-- Initialization                                                     -->
    <!-- ================================================================== -->
@@ -48,6 +50,7 @@
    -->
 
    <target name="init" unless="init.disable" depends="_buildmagic:init">
+      <available file="${forums.lib}" type="dir"/>
    </target>
 
    <!--+====================================================================+-->
@@ -157,7 +160,19 @@
 		<fileset dir="${jboss-jaae-engine.lib}" includes="*.jar"/>
 		<!-- sar configuration files -->
 		<fileset dir="${build.resources}/forums-authz-plugin.sar"/>
-      </jar>      
+      </jar>    
+              
+         <!-- Luca Stancapiano - 7 apr 2007 - I added theese six 
+              rows to achieve complete create for jboss-forums.ear -->  
+         <copy todir="${forums.root}/resources/portal-forums-ear">
+		<fileset dir="${build.lib}" includes="portal-forums-authz-plugin.sar"/>
+         </copy>
+         <jar jarfile="${forums.lib}/jboss-forums.ear">
+		<fileset dir="${forums.root}/resources/portal-forums-ear" includes="**/*"/>
+         </jar>
+      
+         <!-- end patch 7 apr 2007 -->
+      
 	</target>
 
 	<target name="explode" depends="init">
@@ -200,8 +215,10 @@
      | Deploy the application
    -->
    <target name="deploy" description="Deploy." depends="output">
-		<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
-		<copy file="${build.lib}/portal-forums-authz-plugin.sar" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>	    
+		<!--<require file="${jboss.home}/server/${portal.deploy.dir}/deploy"/>
+		<copy file="${build.lib}/portal-forums-authz-plugin.sar" todir="${jboss.home}/server/${portal.deploy.dir}/deploy"/>-->
+                <require file="../forums/output/lib"/>
+                <copy file="${build.lib}/portal-forums-authz-plugin.sar" todir="../forums/output/lib/"/>
 	</target>
 
    <!--

Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2007-05-10 18:44:29 UTC (rev 11817)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-ear/META-INF/jboss-app.xml	2007-05-10 18:56:30 UTC (rev 11818)
@@ -4,6 +4,9 @@
       <service>portal-forums.sar</service>
    </module>
    <module>
+           <service>portal-forums-authz-plugin.sar</service>
+   </module>
+   <module>
       <service>jboss-service.xml</service>
    </module>
 </jboss-app>