You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by rw...@apache.org on 2010/03/10 01:15:28 UTC
svn commit: r921190 - in /portals/jetspeed-2/portal/trunk: ./
components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/
Author: rwatler
Date: Wed Mar 10 00:15:27 2010
New Revision: 921190
URL: http://svn.apache.org/viewvc?rev=921190&view=rev
Log:
Properly support metadata for DBPSML FragmentDefinition implementation
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java?rev=921190&r1=921189&r2=921190&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java Wed Mar 10 00:15:27 2010
@@ -24,6 +24,7 @@ import org.apache.jetspeed.JetspeedActio
import org.apache.jetspeed.om.page.BaseFragmentElement;
import org.apache.jetspeed.om.page.BaseFragmentValidationListener;
import org.apache.jetspeed.om.page.BaseFragmentsElement;
+import org.apache.jetspeed.om.page.PageMetadataImpl;
import org.apache.jetspeed.page.document.impl.DocumentImpl;
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
@@ -47,6 +48,16 @@ public abstract class BaseFragmentsEleme
}
/* (non-Javadoc)
+ * @see org.apache.jetspeed.page.document.impl.NodeImpl#newPageMetadata(java.util.Collection)
+ */
+ public PageMetadataImpl newPageMetadata(Collection fields)
+ {
+ PageMetadataImpl pageMetadata = new PageMetadataImpl(PageMetadataLocalizedFieldImpl.class);
+ pageMetadata.setFields(fields);
+ return pageMetadata;
+ }
+
+ /* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#getRootFragment()
*/
public BaseFragmentElement getRootFragment()
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java?rev=921190&r1=921189&r2=921190&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java Wed Mar 10 00:15:27 2010
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.Collection;
import java.util.List;
import org.apache.jetspeed.om.folder.MenuDefinition;
@@ -26,7 +25,6 @@ import org.apache.jetspeed.om.folder.Men
import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
import org.apache.jetspeed.om.page.BasePageElement;
import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.PageMetadataImpl;
import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
@@ -76,16 +74,6 @@ public abstract class BasePageElementImp
}
/* (non-Javadoc)
- * @see org.apache.jetspeed.page.document.impl.NodeImpl#newPageMetadata(java.util.Collection)
- */
- public PageMetadataImpl newPageMetadata(Collection fields)
- {
- PageMetadataImpl pageMetadata = new PageMetadataImpl(PageMetadataLocalizedFieldImpl.class);
- pageMetadata.setFields(fields);
- return pageMetadata;
- }
-
- /* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#getSkin()
*/
public String getSkin()
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=921190&r1=921189&r2=921190&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Wed Mar 10 00:15:27 2010
@@ -1604,6 +1604,7 @@
<inherited>false</inherited>
<configuration>
<targets combine.children="append">
+ <!-- test targets -->
<target>
<id>testdb</id>
<name>db-init</name>
@@ -1624,6 +1625,12 @@
<goals>install</goals>
<profiles>test</profiles>
</target>
+ <!-- demo portal build intermediate target -->
+ <target>
+ <id>demo-install</id>
+ <dir>@rootdir@/applications/jetspeed-demo</dir>
+ </target>
+ <!-- db initialize intermediate target -->
<target>
<id>proddb</id>
<name>db-init</name>
@@ -1631,10 +1638,7 @@
<database.type>production</database.type>
</properties>
</target>
- <target>
- <id>demo-install</id>
- <dir>@rootdir@/applications/jetspeed-demo</dir>
- </target>
+ <!-- db seed intermediate targets -->
<target>
<id>demo-seed</id>
<name>demo</name>
@@ -1653,20 +1657,16 @@
<seed.file>min/j2-seed.xml</seed.file>
</properties>
</target>
+ <!-- initialize and seed db intermediate targets -->
<target>
- <id>demo-seed-dbpsml</id>
- <depends>demo-db</depends>
- <name>demo</name>
- <dir>@rootdir@/applications/jetspeed-demo</dir>
- <profiles>seed-dbpsml</profiles>
+ <id>demo-db</id>
+ <depends>proddb,demo-seed</depends>
</target>
- <target>
- <id>min-seed-dbpsml</id>
- <depends>demo-db</depends>
- <name>demo</name>
- <dir>@rootdir@/applications/jetspeed-demo</dir>
- <profiles>minseed-dbpsml</profiles>
- </target>
+ <target>
+ <id>min-db</id>
+ <depends>proddb,min-seed</depends>
+ </target>
+ <!-- portal and portal app deployment intermediate targets -->
<target>
<id>demo-deploy</id>
<name>demo</name>
@@ -1679,24 +1679,29 @@
<dir>@rootdir@/applications/jetspeed-demo</dir>
<profiles>deploy-min</profiles>
</target>
+ <!-- portal dbpsml config deployment intermediate targets -->
<target>
<id>demo-deploy-dbpsml</id>
<name>demo</name>
<dir>@rootdir@/applications/jetspeed-demo</dir>
<profiles>deploy-dbpsml</profiles>
</target>
+ <!-- dbpsml seed db intermediate targets -->
<target>
- <id>demo-db</id>
- <depends>proddb,demo-seed</depends>
- </target>
- <target>
- <id>min-db</id>
- <depends>proddb,min-seed</depends>
+ <id>demo-seed-dbpsml</id>
+ <depends>demo-db</depends>
+ <name>demo</name>
+ <dir>@rootdir@/applications/jetspeed-demo</dir>
+ <profiles>seed-dbpsml</profiles>
</target>
<target>
- <id>demo-db-psml</id>
- <depends>demo-db,demo-seed-dbpsml</depends>
- </target>
+ <id>min-seed-dbpsml</id>
+ <depends>demo-db</depends>
+ <name>demo</name>
+ <dir>@rootdir@/applications/jetspeed-demo</dir>
+ <profiles>minseed-dbpsml</profiles>
+ </target>
+ <!-- demo top level targets -->
<target>
<id>demo</id>
<depends>demo-install,demo-db,demo-deploy</depends>
@@ -1704,14 +1709,14 @@
<target>
<id>min</id>
<depends>demo-install,demo-db,demo-deploy-min</depends>
- </target>
+ </target>
<target>
<id>min-dbpsml</id>
<depends>demo-install,demo-db,demo-deploy-min,demo-deploy-dbpsml,min-seed-dbpsml</depends>
- </target>
+ </target>
<target>
<id>demo-dbpsml</id>
- <depends>demo-db-psml,demo-deploy,demo-deploy-dbpsml</depends>
+ <depends>demo-install,demo-db,demo-deploy,demo-deploy-dbpsml,demo-seed-dbpsml</depends>
</target>
</targets>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org