portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
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 GMT
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


Mime
View raw message