Return-Path: 
 <jetspeed-dev-return-33877-apmail-portals-jetspeed-dev-archive=portals.apache.org@portals.apache.org>
Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org
Received: (qmail 12861 invoked from network); 16 Apr 2009 17:42:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 16 Apr 2009 17:42:22 -0000
Received: (qmail 64869 invoked by uid 500); 16 Apr 2009 17:42:22 -0000
Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org
Received: (qmail 64819 invoked by uid 500); 16 Apr 2009 17:42:22 -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 64809 invoked by uid 99); 16 Apr 2009 17:42:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2009 17:42:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2009 17:42:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 34975238889D; Thu, 16 Apr 2009 17:41:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r765702 - in /portals/jetspeed-2/portal/trunk:
 applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
 applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml pom.xml
Date: Thu, 16 Apr 2009 17:41:58 -0000
To: jetspeed-dev@portals.apache.org
From: woonsan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090416174159.34975238889D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: woonsan
Date: Thu Apr 16 17:41:58 2009
New Revision: 765702

URL: http://svn.apache.org/viewvc?rev=765702&view=rev
Log:
Some house working:
 - Fixing portlet id in psml

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml?rev=765702&r1=765701&r2=765702&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml Thu Apr 16 17:41:58 2009
@@ -587,6 +587,11 @@
                       <delete>./rss</delete>
                     </deployment>
                     <deployment>
+                      <artifact>org.apache.portals.applications:apa-webcontent-war:war</artifact>
+                      <targetName>webcontent.war</targetName>
+                      <delete>./webcontent</delete>
+                    </deployment>
+                    <deployment>
                       <artifact>org.apache.portals.bridges:jpetstore:war</artifact>
                       <infuse>true</infuse>
                       <delete>./jpetstore</delete>
@@ -673,6 +678,12 @@
                 <type>war</type>
               </dependency>
               <dependency>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>apa-webcontent-war</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>war</type>
+              </dependency>
+              <dependency>
                 <groupId>org.apache.portals.bridges</groupId>
                 <artifactId>jsf-demo</artifactId>
                 <version>1.0.4</version>

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml?rev=765702&r1=765701&r2=765702&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/default-page.psml Thu Apr 16 17:41:58 2009
@@ -59,11 +59,11 @@
       <property layout="TwoColumns" name="row" value="2" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="dp-9" type="portlet" name="demo::IFramePortlet" decorator="gray-gradient-noborder">
+    <fragment id="dp-9" type="portlet" name="webcontent::IFramePortlet" decorator="gray-gradient-noborder">
       <property layout="TwoColumns" name="row" value="3" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="dp-10" type="portlet" name="demo::IFramePortlet" decorator="gray-gradient-noborder">
+    <fragment id="dp-10" type="portlet" name="webcontent::IFramePortlet" decorator="gray-gradient-noborder">
       <property layout="TwoColumns" name="row" value="4" />
       <property layout="TwoColumns" name="column" value="0" />
       <preference name="SRC">

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=765702&r1=765701&r2=765702&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Thu Apr 16 17:41:58 2009
@@ -318,6 +318,7 @@
     <org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
     <org.apache.portals.applications.apa-demo.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-demo.version>
     <org.apache.portals.applications.apa-rss.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-rss.version>
+    <org.apache.portals.applications.apa-webcontent.version>1.0-SNAPSHOT</org.apache.portals.applications.apa-webcontent.version>
     <oro.version>2.0.8</oro.version>
     <portlet-api.version>2.0</portlet-api.version>
     <regexp.version>1.2</regexp.version>
@@ -556,7 +557,13 @@
         <groupId>org.apache.portals.applications</groupId>
         <artifactId>apa-rss-war</artifactId>
         <type>war</type>
-        <version>${org.apache.portals.applications.apa-demo.version}</version>
+        <version>${org.apache.portals.applications.apa-rss.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.applications</groupId>
+        <artifactId>apa-webcontent-war</artifactId>
+        <type>war</type>
+        <version>${org.apache.portals.applications.apa-webcontent.version}</version>
       </dependency>
 
       <!-- Standard APIs -->



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