Return-Path: 
 <jetspeed-dev-return-24568-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 39916 invoked from network); 23 Nov 2005 05:32:30 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 23 Nov 2005 05:32:30 -0000
Received: (qmail 42734 invoked by uid 500); 23 Nov 2005 05:32:29 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 42698 invoked by uid 500); 23 Nov 2005 05:32:28 -0000
Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jetspeed-dev-help@portals.apache.org>
List-Unsubscribe: <mailto:jetspeed-dev-unsubscribe@portals.apache.org>
List-Post: <mailto:jetspeed-dev@portals.apache.org>
List-Id: <jetspeed-dev.portals.apache.org>
Reply-To: "Jetspeed Developers List" <jetspeed-dev@portals.apache.org>
Delivered-To: mailing list jetspeed-dev@portals.apache.org
Received: (qmail 42687 invoked by uid 99); 23 Nov 2005 05:32:28 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Nov 2005 21:32:28 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 22 Nov 2005 21:33:59 -0800
Received: (qmail 39787 invoked by uid 65534); 23 Nov 2005 05:32:06 -0000
Message-ID: <20051123053206.39786.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: svn commit: r348379 - in /portals/jetspeed-2/trunk:
 maven-plugin/plugin.jelly project.properties
 src/webapp/WEB-INF/pages/jsf-demo.psml
 src/webapp/WEB-INF/pages/struts-demo.psml src/webapp/pages/
Date: Wed, 23 Nov 2005 05:32:04 -0000
To: jetspeed-dev@portals.apache.org
From: taylor@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: taylor
Date: Tue Nov 22 21:31:56 2005
New Revision: 348379

URL: http://svn.apache.org/viewcvs?rev=348379&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-413

Simplify Build, step three
cleaning up main build


Removed:
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/struts-demo.psml
    portals/jetspeed-2/trunk/src/webapp/pages/
Modified:
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/project.properties
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=348379&r1=348378&r2=348379&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Tue Nov 22 21:31:56 2005
@@ -351,6 +351,13 @@
       <j:set var="j2.war.version" value="${jetspeed.version}"/>
       <attainGoal name="j2:warDeploy"/>
   </goal>
+  
+  <goal name="j2:deploybridgewar">
+      <j:set var="j2.war.groupId" value="${bridges.groupId}"/>
+      <j:set var="j2.war.version" value="${portals.bridges.version}"/>
+      <attainGoal name="j2:warDeploy"/>
+  </goal>
+  
   <!-- warDeploy allows you to deploy arbitrary wars to the portal deploy folder,
        optionally downloading it from remote repositories if not available yet
        Required properties to set:
@@ -392,24 +399,14 @@
     <attainGoal name="j2:deploy"/>
   </goal>
 
-  <goal name="j2:pam.strutsdeploy">
-    <j:set var="maven.war.final.name" value="struts-demo"/>
-    <attainGoal name="j2:deploy"/>
-  </goal>
-
   <goal name="j2:pam.jpetstoredeploy">
     <j:set var="maven.war.final.name" value="jpetstore"/>
-    <attainGoal name="j2:deploy"/>
+    <attainGoal name="j2:deploybridgewar"/>
   </goal>
 
   <goal name="j2:pam.jsfdeploy">
     <j:set var="maven.war.final.name" value="jsf-demo"/>
-    <attainGoal name="j2:deploy"/>
-  </goal>
-
-  <goal name="j2:pam.jsfmyfacesdeploy">
-    <j:set var="maven.war.final.name" value="jsf-demo-myfaces"/>
-    <attainGoal name="j2:deploy"/>
+    <attainGoal name="j2:deploybridgewar"/>
   </goal>
 
   <goal name="j2:pam.admindeploy">
@@ -419,12 +416,12 @@
 
   <goal name="j2:pam.phpdeploy">
     <j:set var="maven.war.final.name" value="php"/>
-    <attainGoal name="j2:deploy"/>
+    <attainGoal name="j2:deploybridgewar"/>
   </goal>
 
   <goal name="j2:pam.perldeploy">
     <j:set var="maven.war.final.name" value="perl"/>
-    <attainGoal name="j2:deploy"/>
+    <attainGoal name="j2:deploybridgewar"/>
   </goal>
 
   <goal name="j2:pam.rssdeploy">
@@ -519,9 +516,7 @@
   <goal name="j2:fullDeploy">
       <attainGoal name="j2:minDeploy"/>
       <attainGoal name="j2:pam.demodeploy"/>
-      <attainGoal name="j2:pam.strutsdeploy"/>
       <attainGoal name="j2:pam.jsfdeploy"/>
-      <attainGoal name="j2:pam.jsfmyfacesdeploy"/>
       <attainGoal name="j2:pam.phpdeploy"/>
       <attainGoal name="j2:pam.perldeploy"/>
       <attainGoal name="j2:pam.rssdeploy"/>
@@ -531,9 +526,7 @@
   <goal name="j2:nodbfullDeploy">
       <attainGoal name="j2:nodbMinDeploy"/>
       <attainGoal name="j2:pam.demodeploy"/>
-      <attainGoal name="j2:pam.strutsdeploy"/>
       <attainGoal name="j2:pam.jsfdeploy"/>
-      <attainGoal name="j2:pam.jsfmyfacesdeploy"/>
       <attainGoal name="j2:pam.phpdeploy"/>
       <attainGoal name="j2:pam.perldeploy"/>
       <attainGoal name="j2:pam.rssdeploy"/>
@@ -552,12 +545,8 @@
       <delete file="${org.apache.jetspeed.deploy.war.dir}/demo.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/j2-admin"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/j2-admin.war"/>
-      <delete dir="${org.apache.jetspeed.deploy.war.dir}/struts-demo"/>
-      <delete file="${org.apache.jetspeed.deploy.war.dir}/struts-demo.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo.war"/>
-      <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo-myfaces"/>
-      <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo-myfaces.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/php"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/php.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/perl"/>

Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=348379&r1=348378&r2=348379&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Tue Nov 22 21:31:56 2005
@@ -20,6 +20,8 @@
 servlet.api.version=2.3
 myfaces.version=1.1.0
 spring.version=1.1.5
+portals.bridges.version=0.4-dev
+bridges.groupId=portals-bridges
 portals.bridges.common.version=0.4-dev
 portals.bridges.frameworks.version=0.4-dev
 portals.bridges.jsf.version=0.4-dev
@@ -34,10 +36,6 @@
 # Whether or not to include commons-logging in war files. Your container may already have this.
 commons.logging.include=true
 
-#This two lines should move to portals-bridges with jpetstore and struts-demo
-struts.version=1.2.7
-struts.include=true
-
 log4j.version=1.2.8
 # Whether or not to include log4j in war files.  Your container may already have this.
 log4j.include=true
@@ -95,7 +93,7 @@
 maven.multiproject.ignoreFailures=false
 
 jar.includes=applications/gems/project.xml,portlet-api/project.xml,commons/project.xml,cps/project.xml,content-server/project.xml,jetspeed-api/project.xml,components/**/project.xml,taglibs/treecontrol/project.xml
-jar.excludes=/project.xml,maven-plugin/**,layout-portlets/**,applications/project.xml,applications/demo/**,applications/jsf-demo/**,applications/localeselector/**,applications/perl/**,applications/php/**,applications/rss/**,applications/j2-admin/**,applications/struts-demo/**,,applications/jpetstore/**site/project.xml,design-docs/project.xml
+jar.excludes=/project.xml,maven-plugin/**,layout-portlets/**,applications/project.xml,applications/demo/**,applications/rss/**,applications/j2-admin/**,site/project.xml,design-docs/project.xml
 
 maven.multiproject.site.goals=site pdf dashboard:report-single
 # For site only, comment line above, uncomment line below.

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml?rev=348379&r1=348378&r2=348379&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/jsf-demo.psml Tue Nov 22 21:31:56 2005
@@ -30,10 +30,6 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
      </fragment>
-     <fragment id="jsfGuessNumber2" type="portlet" name="jsf-demo-myfaces::guessNumberMyFaces">
-      <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="0" />
-     </fragment>
   </fragment>
   <metadata name="title" xml:lang="ja">JSF デモ</metadata>
   <metadata name="title" xml:lang="es">Demo Java Server Faces</metadata>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org