[jboss-svn-commits] JBL Code SVN: r15265 - in labs/jbosslabs/qa/portal-extensions: forge-kosmos-portlets and 1 other directories.

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

Author: adamw
Date: 2007-09-20 13:52:57 -0400 (Thu, 20 Sep 2007)
New Revision: 15265

Modified:
   labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml
   labs/jbosslabs/qa/portal-extensions/maven.xml
   labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
MERGE 15227:15264

Modified: labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml	2007-09-20 17:16:30 UTC (rev 15264)
+++ labs/jbosslabs/qa/portal-extensions/forge-kosmos-portlets/maven.xml	2007-09-20 17:52:57 UTC (rev 15265)
@@ -7,27 +7,30 @@
 	<!-- Default war-project goals -->
 
 	<goal name="all">
-		<attainGoal name="prj-all" />
+		<!-- <attainGoal name="prj-all" /> -->
 	</goal>
 
 	<goal name="build">
+<!--
 		<ant:copy tofile="src/web/WEB-INF/portlet.xml" file="src/web/WEB-INF/portlet.template.xml" overwrite="true"/>
 		<ant:replace file="src/web/WEB-INF/portlet.xml" propertyFile="kosmos.properties">
   			<ant:replacefilter token="#{kosmos.server.address}" property="kosmos.server.address"/>
 		</ant:replace>
 		
 		<attainGoal name="prj-war-build" />
+-->
 	</goal>
     
 	<goal name="deploy">
-		<attainGoal name="prj-war-deploy" />
+<!--	
+	<attainGoal name="prj-war-deploy" />
 		
 		<ant:copy todir="${local.deploy.dir}" file="../binaries/maven-repo-addons/hessian/jars/hessian-3.0.13.jar" overwrite="false"/>
 		<ant:copy todir="${local.deploy.dir}" file="../binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar" overwrite="false"/>
-		
+-->	
 	</goal>
 	
 	<goal name="clean">
-		<attainGoal name="prj-clean" />
+	<!--	<attainGoal name="prj-clean" /> -->
 	</goal>
 </project>

Modified: labs/jbosslabs/qa/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/maven.xml	2007-09-20 17:16:30 UTC (rev 15264)
+++ labs/jbosslabs/qa/portal-extensions/maven.xml	2007-09-20 17:52:57 UTC (rev 15265)
@@ -92,10 +92,12 @@
 	<!-- A goal that deploys the sar into the appserver -->
 	<goal name="deploy-sar">
 		<!-- Copying forge-service.xml -->
+		<!--
 		<ant:copy
 			file="${forge.sar.dir}/src/forge-service.xml"
 			todir="${local.deploy.dir}"
 			overwrite="true" />
+		-->
 
 		<!-- Copying JAXB jars to the lib directory -->
 		<ant:copy 

Modified: labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-09-20 17:16:30 UTC (rev 15264)
+++ labs/jbosslabs/qa/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml	2007-09-20 17:52:57 UTC (rev 15265)
@@ -95,8 +95,8 @@
 					<instance-ref>
 						PrimatesPortletMugshotInstance
 					</instance-ref>
-					<region>left</region>
-					<height>1</height>
+					<region>right</region>
+					<height>4</height>
 				</window>
 
                 <window>