You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2007/01/24 18:20:55 UTC
svn commit: r499486 [14/44] - in /ofbiz/trunk: ./ applications/
applications/accounting/ applications/accounting/data/
applications/accounting/entitydef/
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbi...
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogScreens.xml Wed Jan 24 09:15:54 2007
@@ -1,139 +1,141 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
--->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
<screen name="CommonBlog">
<section>
<actions>
- <set field="currentMenuItemName"
- from-field="currentMenuItemName" default-value="all"
+ <set field="currentMenuItemName"
+ from-field="currentMenuItemName" default-value="all"
from-scope="user" />
- <set field="leftbarScreenName" value="leftbar" />
- <set field="rightbarScreenName" value="rightbar" />
- <set field="leftbarScreenLocation"
- value="component://ecommerce/widget/CommonScreens.xml" />
- <set field="rightbarScreenLocation"
- value="component://ecommerce/widget/CommonScreens.xml" />
+ <set field="leftbarScreenName" value="leftbar" />
+ <set field="rightbarScreenName" value="rightbar" />
+ <set field="leftbarScreenLocation"
+ value="component://ecommerce/widget/CommonScreens.xml" />
+ <set field="rightbarScreenLocation"
+ value="component://ecommerce/widget/CommonScreens.xml" />
</actions>
<widgets>
- <decorator-screen name="main-decorator"
- location="${parameters.mainDecoratorLocation}">
+ <decorator-screen name="main-decorator"
+ location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container style="bloghr">
- <label text="Blogs: " style="blogtitle" />
- <!--
- <container style="appbarleft">
- <include-menu name="blogmenu" location="component://ecommerce/widget/blog/BlogMenus.xml" />
- </container>
- -->
+ <label text="Blogs: " style="blogtitle" />
+ <!--
+ <container style="appbarleft">
+ <include-menu name="blogmenu" location="component://ecommerce/widget/blog/BlogMenus.xml" />
+ </container>
+ -->
</container>
<decorator-section-include name="body" />
</decorator-section>
</decorator-screen>
</widgets>
</section>
- </screen>
-
+ </screen>
+
<screen name="MainBlog">
<section>
<actions>
- <set field="MainColumnStyle" value="center" />
- <property-to-field property="blog.view.size"
+ <set field="MainColumnStyle" value="center" />
+ <property-to-field property="blog.view.size"
field="blogViewSize" resource="blog" default="10"/>
- <set field="caContentId"
+ <set field="caContentId"
from-field="parameters.caContentId" />
- <entity-condition entity-name="ContentAssocViewTo"
+ <entity-condition entity-name="ContentAssocViewTo"
use-cache="false" list-name="blogList">
<condition-list combine="and">
- <condition-expr field-name="contentIdStart"
+ <condition-expr field-name="contentIdStart"
operator="equals" env-name="caContentId" />
- <condition-expr
- field-name="caContentAssocTypeId" operator="equals"
+ <condition-expr
+ field-name="caContentAssocTypeId" operator="equals"
value="PUBLISH_LINK" />
- <condition-expr field-name="caThruDate"
+ <condition-expr field-name="caThruDate"
operator="equals" value="" />
- <condition-expr field-name="statusId"
+ <condition-expr field-name="statusId"
operator="equals" value="BLOG_PUBLISHED" />
</condition-list>
- <order-by field-name="caFromDate DESC" />
+ <order-by field-name="caFromDate DESC" />
</entity-condition>
- <set field="viewIndex"
+ <set field="viewIndex"
from-field="requestParameters.VIEW_INDEX" type="Integer" />
</actions>
<widgets>
<section>
<!-- if viewer has update permission, show all blogs, even those that were preview only -->
<condition>
- <if-entity-permission entity-id="${caContentId}"
+ <if-entity-permission entity-id="${caContentId}"
entity-name="Content" target-operation="CONTENT_CREATE" />
</condition>
- <actions>
- <service
- service-name="getOwnedOrPublishedBlogEntries"
- result-map-name="result">
- <field-map field-name="contentId"
- env-name="caContentId" />
- <field-map field-name="userLogin"
- env-name="userLogin" />
- </service>
- <set field="blogList"
+ <actions>
+ <service
+ service-name="getOwnedOrPublishedBlogEntries"
+ result-map-name="result">
+ <field-map field-name="contentId"
+ env-name="caContentId" />
+ <field-map field-name="userLogin"
+ env-name="userLogin" />
+ </service>
+ <set field="blogList"
from-field="result.blogList" default-value="${blogList}" />
</actions>
<widgets />
</section>
- <decorator-screen name="CommonBlog">
- <decorator-section name="body">
+ <decorator-screen name="CommonBlog">
+ <decorator-section name="body">
<section>
<condition>
- <if-entity-permission
- entity-id="${caContentId}" entity-name="Content"
+ <if-entity-permission
+ entity-id="${caContentId}" entity-name="Content"
target-operation="CONTENT_CREATE" />
</condition>
<widgets>
- <link text="Add New"
- target="EditBlog?caContentId=${caContentId}&ownerContentId=${parameters.ownerContentId}"
+ <link text="Add New"
+ target="EditBlog?caContentId=${caContentId}&ownerContentId=${parameters.ownerContentId}"
style="tabButton" url-mode="inter-app" />
</widgets>
- </section>
- <iterate-section list-name="blogList"
- entry-name="blog" view-size="${blogViewSize}" paginate="true"
+ </section>
+ <iterate-section list-name="blogList"
+ entry-name="blog" view-size="${blogViewSize}" paginate="true"
paginate-target="MainBlog?caContentId=${parameters.caContentId}&ownerContentId=${parameters.ownerContentId}">
<section name="firstBlog">
<condition>
- <if-compare field-name="itemIndex"
+ <if-compare field-name="itemIndex"
operator="equals" type="Integer" value="0" />
</condition>
<widgets>
<container style="blogwrapper">
- <include-menu name="view_edit"
+ <include-menu name="view_edit"
location="component://ecommerce/widget/blog/BlogMenus.xml" />
- <label
+ <label
text="${blog.contentName}" style="blogheader" />
- <!--
- <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" />
+ <!--
+ <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" />
-->
<label text="<br/>" />
<container style="blogtext">
- <sub-content
+ <sub-content
map-key="SUMMARY" content-id="${blog.contentId}" />
</container>
</container>
@@ -141,22 +143,22 @@
</section>
<section name="allOtherBlogs">
<condition>
- <if-compare field-name="itemIndex"
+ <if-compare field-name="itemIndex"
operator="greater" type="Integer" value="0" />
</condition>
<widgets>
<container style="blogwrapper">
- <include-menu name="view_edit"
+ <include-menu name="view_edit"
location="component://ecommerce/widget/blog/BlogMenus.xml" />
- <label
- text="${blog.contentName}[${blog.contentId}]"
+ <label
+ text="${blog.contentName}[${blog.contentId}]"
style="blogheader" />
- <!--
- <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" />
+ <!--
+ <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" />
-->
<label text="<br/>" />
<container style="blogtext">
- <label
+ <label
text="${blog.description}" style="blogtext" />
</container>
</container>
@@ -167,133 +169,133 @@
</decorator-screen>
</widgets>
</section>
- </screen>
-
-
+ </screen>
+
+
<screen name="EditBlog">
<section>
<condition>
<or>
- <if-has-permission permission="CONTENTMGR"
+ <if-has-permission permission="CONTENTMGR"
action="CREATE" />
- <if-entity-permission
- entity-id="${parameters.caContentId}" entity-name="Content"
+ <if-entity-permission
+ entity-id="${parameters.caContentId}" entity-name="Content"
target-operation="CONTENT_CREATE" />
</or>
</condition>
- <actions>
- <set field="contentId"
+ <actions>
+ <set field="contentId"
from-field="parameters.contentId" />
- <entity-one entity-name="ContentAssocDataResourceViewTo"
+ <entity-one entity-name="ContentAssocDataResourceViewTo"
value-name="view">
- <field-map env-name="parameters.caContentId"
+ <field-map env-name="parameters.caContentId"
field-name="contentIdStart" />
- <field-map env-name="parameters.caContentId"
+ <field-map env-name="parameters.caContentId"
field-name="caContentId" />
- <field-map env-name="parameters.caContentIdTo"
+ <field-map env-name="parameters.caContentIdTo"
field-name="caContentIdTo" />
- <field-map env-name="parameters.contentId"
+ <field-map env-name="parameters.contentId"
field-name="contentId" />
- <field-map env-name="parameters.caFromDate"
+ <field-map env-name="parameters.caFromDate"
field-name="caFromDate" />
- <field-map
- env-name="parameters.caContentAssocTypeId"
+ <field-map
+ env-name="parameters.caContentAssocTypeId"
field-name="caContentAssocTypeId" />
- <field-map env-name="parameters.drDataResourceId"
+ <field-map env-name="parameters.drDataResourceId"
field-name="drDataResourceId" />
- </entity-one>
- <set field="view.contentId" from-field="view.contentId"
- default-value="${parameters.contentId}" />
- <set field="view.caContentId"
- from-field="view.caContentId"
- default-value="${parameters.caContentId}" />
- <set field="view.ownerContentId"
- from-field="view.ownerContentId"
+ </entity-one>
+ <set field="view.contentId" from-field="view.contentId"
+ default-value="${parameters.contentId}" />
+ <set field="view.caContentId"
+ from-field="view.caContentId"
+ default-value="${parameters.caContentId}" />
+ <set field="view.ownerContentId"
+ from-field="view.ownerContentId"
default-value="${parameters.caContentId}" />
<set field="view.contentTypeId" value="DOCUMENT" />
- <set field="view.drDataResourceTypeId"
+ <set field="view.drDataResourceTypeId"
value="ELECTRONIC_TEXT" />
- <set field="view.caContentAssocTypeId"
+ <set field="view.caContentAssocTypeId"
value="PUBLISH_LINK" />
<set field="thisContentId" from-field="view.contentId" />
- <set field="drMimeTypeId"
+ <set field="drMimeTypeId"
from-field="view.drMimeTypeId" />
- <set field="drDataTemplateTypeId"
+ <set field="drDataTemplateTypeId"
from-field="view.drDataTemplateTypeId" />
- <entity-one entity-name="ElectronicText"
+ <entity-one entity-name="ElectronicText"
value-name="electronicText" use-cache="true">
- <field-map env-name="parameters.drDataResourceId"
+ <field-map env-name="parameters.drDataResourceId"
field-name="dataResourceId" />
</entity-one>
<set field="summaryMapKey" value="SUMMARY" />
- <service service-name="getSubContent"
+ <service service-name="getSubContent"
result-map-name="result" auto-field-map="false">
- <field-map field-name="contentId"
+ <field-map field-name="contentId"
env-name="view.contentId" />
- <field-map field-name="mapKey"
+ <field-map field-name="mapKey"
env-name="summaryMapKey" />
</service>
- <entity-one entity-name="ElectronicText"
+ <entity-one entity-name="ElectronicText"
value-name="summaryText" use-cache="false">
- <field-map field-name="dataResourceId"
+ <field-map field-name="dataResourceId"
env-name="result.view.dataResourceId" />
</entity-one>
<set field="imageMapKey" value="IMAGE" />
- <service service-name="getSubContent"
+ <service service-name="getSubContent"
result-map-name="imageResult" auto-field-map="false">
- <field-map field-name="contentId"
+ <field-map field-name="contentId"
env-name="view.contentId" />
- <field-map field-name="mapKey"
+ <field-map field-name="mapKey"
env-name="imageMapKey" />
</service>
- <set field="imageContent" from-field="imageResult.view"
+ <set field="imageContent" from-field="imageResult.view"
type="Object" />
<set field="mainMapKey" value="MAIN" />
- <service service-name="getSubContent"
+ <service service-name="getSubContent"
result-map-name="textResult" auto-field-map="false">
- <field-map field-name="contentId"
+ <field-map field-name="contentId"
env-name="view.contentId" />
- <field-map field-name="mapKey"
+ <field-map field-name="mapKey"
env-name="mainMapKey" />
</service>
- <set field="textContent" from-field="textResult.view"
+ <set field="textContent" from-field="textResult.view"
type="Object" />
- <entity-one entity-name="ElectronicText"
+ <entity-one entity-name="ElectronicText"
value-name="textElectronicText" use-cache="true">
- <field-map env-name="textResult.view.dataResourceId"
+ <field-map env-name="textResult.view.dataResourceId"
field-name="dataResourceId" />
</entity-one>
<set field="view.contentTypeId" value="DOCUMENT" />
- <set field="view.caContentAssocTypeId"
+ <set field="view.caContentAssocTypeId"
value="PUBLISH_LINK" />
- <set field="view.drDataResourceTypeId"
+ <set field="view.drDataResourceTypeId"
value="ELECTRONIC_TEXT" />
</actions>
- <widgets>
+ <widgets>
<decorator-screen name="CommonBlog">
- <decorator-section name="body">
- <include-form name="EditBlogAll"
- location="component://ecommerce/widget/blog/BlogForms.xml" />
+ <decorator-section name="body">
+ <include-form name="EditBlogAll"
+ location="component://ecommerce/widget/blog/BlogForms.xml" />
<platform-specific>
<html>
- <html-template
+ <html-template
location="component://ecommerce/widget/blog/textimage.ftl" />
</html>
</platform-specific>
- <include-form name="editFormSubmit"
+ <include-form name="editFormSubmit"
location="component://ecommerce/widget/blog/BlogForms.xml" />
- <include-form name="editFormEnd"
+ <include-form name="editFormEnd"
location="component://ecommerce/widget/blog/BlogForms.xml" />
<label text="<hr/>" />
<content content-id="${thisContentId}" />
</decorator-section>
</decorator-screen>
- </widgets>
- <fail-widgets>
- <label text="Permissions failed."></label>
+ </widgets>
+ <fail-widgets>
+ <label text="Permissions failed."></label>
</fail-widgets>
</section>
</screen>
@@ -301,19 +303,19 @@
<screen name="ViewBlog">
<section>
<actions>
- <set field="articleContentId"
+ <set field="articleContentId"
from-field="parameters.articleContentId" />
- <set field="ownerContentId"
+ <set field="ownerContentId"
from-field="parameters.contentId" />
- <entity-one entity-name="Content" value-name="content"
+ <entity-one entity-name="Content" value-name="content"
use-cache="true">
- <field-map field-name="contentId"
+ <field-map field-name="contentId"
env-name="articleContentId" />
</entity-one>
<set field="enableEdit" value="false" />
- <property-to-field property="root.publish.point.blog"
+ <property-to-field property="root.publish.point.blog"
field="webPutPt" resource="blog" />
- <set field="rsp.contentName"
+ <set field="rsp.contentName"
value="RE:${content.contentName}" />
</actions>
<widgets>
@@ -321,59 +323,59 @@
<decorator-section name="body">
<label text="<p/>" />
<container style="bloghr">
- <label text="${content.contentName}"
+ <label text="${content.contentName}"
style="blogtitle" />
</container>
<container style="blogcontentwrapper">
<content content-id="${articleContentId}" />
</container>
- <section>
- <condition>
- <if-entity-permission
- entity-id="${articleContentId}" entity-name="Content"
- target-operation="CONTENT_UPDATE" />
- </condition>
- <widgets>
- <link text="Edit"
- target="EditBlog?caContentId=${parameters.caContentId}&caContentIdTo=${parameters.caContentIdTo}&contentId=${parameters.contentId}&caContentAssocTypeId=${parameters.caContentAssocTypeId}&caFromDate=${parameters.caFromDate}&drDataResourceId=${parameters.drDataResourceId}"
- style="tabButton" url-mode="inter-app" />
- </widgets>
- </section>
-
+ <section>
+ <condition>
+ <if-entity-permission
+ entity-id="${articleContentId}" entity-name="Content"
+ target-operation="CONTENT_UPDATE" />
+ </condition>
+ <widgets>
+ <link text="Edit"
+ target="EditBlog?caContentId=${parameters.caContentId}&caContentIdTo=${parameters.caContentIdTo}&contentId=${parameters.contentId}&caContentAssocTypeId=${parameters.caContentAssocTypeId}&caFromDate=${parameters.caFromDate}&drDataResourceId=${parameters.drDataResourceId}"
+ style="tabButton" url-mode="inter-app" />
+ </widgets>
+ </section>
+
<label text="<p/>" />
<include-screen name="BlogResponses" />
<label text="<p/>" />
- <!--
- <link text="Latest" target="LatestResponses?ownerContentId=${webPubPt}" />
+ <!--
+ <link text="Latest" target="LatestResponses?ownerContentId=${webPubPt}" />
-->
<container style="bloghr">
- <label text="Respond to this blog: "
- style="blogtitle" />
- <section>
- <!-- if viewer has update permission, show all blogs, even those that were preview only -->
- <condition>
- <and>
- <if-compare
- field-name="content.statusId" operator="equals"
- value="BLOG_PUBLISHED" />
- <if-entity-permission
- entity-id="${parameters.caContentId}" entity-name="Content"
- target-operation="HAS_USER_ROLE" />
- </and>
- </condition>
- <actions>
- </actions>
- <widgets>
- <include-screen name="AddBlogResponse" />
- </widgets>
- <fail-widgets>
- <label
- text="You must be logged in in order to post comments." />
- </fail-widgets>
- </section>
- </container>
+ <label text="Respond to this blog: "
+ style="blogtitle" />
+ <section>
+ <!-- if viewer has update permission, show all blogs, even those that were preview only -->
+ <condition>
+ <and>
+ <if-compare
+ field-name="content.statusId" operator="equals"
+ value="BLOG_PUBLISHED" />
+ <if-entity-permission
+ entity-id="${parameters.caContentId}" entity-name="Content"
+ target-operation="HAS_USER_ROLE" />
+ </and>
+ </condition>
+ <actions>
+ </actions>
+ <widgets>
+ <include-screen name="AddBlogResponse" />
+ </widgets>
+ <fail-widgets>
+ <label
+ text="You must be logged in in order to post comments." />
+ </fail-widgets>
+ </section>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -382,24 +384,24 @@
<screen name="ViewResponse">
<section>
<actions>
- <set field="caContentId"
+ <set field="caContentId"
from-field="parameters.contentId" />
- <set field="responseContentId"
+ <set field="responseContentId"
from-field="parameters.contentId" />
- <set field="articleContentId"
+ <set field="articleContentId"
from-field="parameters.articleContentId" />
- <set field="ownerContentId"
+ <set field="ownerContentId"
from-field="parameters.ownerContentId" />
- <entity-one entity-name="Content" value-name="content"
+ <entity-one entity-name="Content" value-name="content"
use-cache="true">
- <field-map field-name="contentId"
+ <field-map field-name="contentId"
env-name="caContentId" />
</entity-one>
<set field="trail" from-field="articleContentId" />
<set field="enableEdit" value="false" />
- <property-to-field property="root.publish.point.blog"
+ <property-to-field property="root.publish.point.blog"
field="webPubPt" resource="blog" />
- <set field="rsp.contentName"
+ <set field="rsp.contentName"
value="${content.contentName}" />
</actions>
<widgets>
@@ -407,7 +409,7 @@
<decorator-section name="body">
<label text="<p/>" />
<container style="bloghr">
- <label text="${content.contentName}"
+ <label text="${content.contentName}"
style="blogtitle" />
</container>
<container style="blogcontentwrapper">
@@ -417,13 +419,13 @@
<section>
<condition>
- <if-compare
- field-name="content.statusId" operator="equals"
+ <if-compare
+ field-name="content.statusId" operator="equals"
value="BLOG_PUBLISHED" />
</condition>
<widgets>
<container style="bloghr">
- <label
+ <label
text="Respond to this response: " style="blogtitle" />
</container>
<include-screen name="AddBlogResponse" />
@@ -432,13 +434,13 @@
<section>
<condition>
- <if-compare
- field-name="content.statusId" operator="equals"
+ <if-compare
+ field-name="content.statusId" operator="equals"
value="BLOG_DRAFT" />
</condition>
<widgets>
<container style="bloghr">
- <label text="Edit this response: "
+ <label text="Edit this response: "
style="blogtitle" />
</container>
<include-screen name="EditBlogResponse" />
@@ -447,10 +449,10 @@
<label text="<p/>" />
<container style="bloghr">
- <label text="Response tree: "
+ <label text="Response tree: "
style="blogtitle" />
</container>
- <include-tree name="ResponseTree"
+ <include-tree name="ResponseTree"
location="component://ecommerce/widget/blog/BlogTrees.xml" />
</decorator-section>
</decorator-screen>
@@ -478,9 +480,9 @@
<widgets>
<decorator-screen name="CommonBlog">
<decorator-section name="body">
- <include-form name="findBlogContent"
+ <include-form name="findBlogContent"
location="component://ecommerce/widget/blog/BlogForms.xml" />
- <include-form name="listFindBlogContent"
+ <include-form name="listFindBlogContent"
location="component://ecommerce/widget/blog/BlogForms.xml" />
</decorator-section>
</decorator-screen>
@@ -490,34 +492,34 @@
<screen name="BlogResponses">
<section>
<actions>
- <entity-condition entity-name="ContentAssocViewTo"
+ <entity-condition entity-name="ContentAssocViewTo"
use-cache="true" list-name="responseList">
<condition-list combine="and">
- <condition-expr field-name="caContentId"
+ <condition-expr field-name="caContentId"
operator="equals" value="${articleContentId}" />
- <condition-expr
- field-name="caContentAssocTypeId" operator="equals"
+ <condition-expr
+ field-name="caContentAssocTypeId" operator="equals"
value="RESPONSE" />
- <condition-expr field-name="caThruDate"
+ <condition-expr field-name="caThruDate"
operator="equals" value="" />
</condition-list>
- <order-by field-name="caFromDate DESC" />
+ <order-by field-name="caFromDate DESC" />
</entity-condition>
- <set field="viewIndex"
+ <set field="viewIndex"
from-field="requestParameters.VIEW_INDEX" type="Integer" />
</actions>
<widgets>
<container style="bloghr">
- <label text="Top-level responses: "
+ <label text="Top-level responses: "
style="blogtitle" />
</container>
- <iterate-section list-name="responseList"
+ <iterate-section list-name="responseList"
entry-name="rsp" view-size="10">
<section name="Blog Responses">
<actions>
- <!--
- <set field="currentNodeTrailPiped" value="${articleContentId}|${rsp.contentId}" />
+ <!--
+ <set field="currentNodeTrailPiped" value="${articleContentId}|${rsp.contentId}" />
-->
</actions>
<widgets>
@@ -531,19 +533,19 @@
<screen name="LatestResponses">
<section>
<actions>
- <entity-condition
- entity-name="ContentAssocDataResourceViewFrom" use-cache="false"
+ <entity-condition
+ entity-name="ContentAssocDataResourceViewFrom" use-cache="false"
list-name="responseList">
<condition-list combine="and">
- <condition-expr field-name="ownerContentId"
+ <condition-expr field-name="ownerContentId"
operator="equals" value="${parameters.ownerContentId}" />
- <condition-expr
- field-name="caContentAssocTypeId" operator="equals"
+ <condition-expr
+ field-name="caContentAssocTypeId" operator="equals"
value="RESPONSE" />
- <condition-expr field-name="caThruDate"
+ <condition-expr field-name="caThruDate"
operator="equals" value="" />
</condition-list>
- <order-by field-name="caFromDate DESC" />
+ <order-by field-name="caFromDate DESC" />
</entity-condition>
</actions>
@@ -551,11 +553,11 @@
<decorator-screen name="CommonBlog">
<decorator-section name="body">
<label text="Latest Responses" />
- <iterate-section list-name="responseList"
+ <iterate-section list-name="responseList"
entry-name="rsp">
<section name="Blog Responses">
<widgets>
- <include-screen
+ <include-screen
name="responseTreeLine" />
</widgets>
</section>
@@ -570,19 +572,19 @@
<widgets>
<section>
<condition>
- <if-compare-field field-name="responseContentId"
+ <if-compare-field field-name="responseContentId"
operator="not-equals" to-field-name="rsp.contentId" />
</condition>
<widgets>
<container>
- <label
- text="${rsp.contentName}[${rsp.contentId}]"
+ <label
+ text="${rsp.contentName}[${rsp.contentId}]"
style="responseheader" />
- <link text="View"
- target="ViewResponse?contentId=${rsp.contentId}&ownerContentId=${rsp.ownerContentId}&articleContentId=${articleContentId}"
+ <link text="View"
+ target="ViewResponse?contentId=${rsp.contentId}&ownerContentId=${rsp.ownerContentId}&articleContentId=${articleContentId}"
style="tabButton" />
<container style="responsetext">
- <label text="${rsp.description}"
+ <label text="${rsp.description}"
style="responsetext" />
</container>
</container>
@@ -590,19 +592,19 @@
</section>
<section>
<condition>
- <if-compare-field field-name="responseContentId"
+ <if-compare-field field-name="responseContentId"
operator="equals" to-field-name="rsp.contentId" />
</condition>
<widgets>
<container style="responseSelected">
- <label
- text="${rsp.contentName}[${rsp.contentId}]"
+ <label
+ text="${rsp.contentName}[${rsp.contentId}]"
style="responseheader" />
- <link text="View"
- target="ViewResponse?contentId=${rsp.contentId}&ownerContentId=${rsp.ownerContentId}&articleContentId=${articleContentId}"
+ <link text="View"
+ target="ViewResponse?contentId=${rsp.contentId}&ownerContentId=${rsp.ownerContentId}&articleContentId=${articleContentId}"
style="tabButton" />
<container style="responsetext">
- <label text="${rsp.description}"
+ <label text="${rsp.description}"
style="responsetext" />
</container>
</container>
@@ -615,13 +617,13 @@
<section>
<widgets>
<container>
- <label text="${rsp.contentName}[${rsp.contentId}]"
+ <label text="${rsp.contentName}[${rsp.contentId}]"
style="responseheader" />
- <link text="View Blog Article"
- target="ViewBlog?articleContentId=${articleContentId}&ownerContentId=${rsp.ownerContentId}"
+ <link text="View Blog Article"
+ target="ViewBlog?articleContentId=${articleContentId}&ownerContentId=${rsp.ownerContentId}"
style="tabButton" />
<container style="responsetext">
- <label text="${rsp.description}"
+ <label text="${rsp.description}"
style="responsetext" />
</container>
</container>
@@ -629,33 +631,33 @@
</section>
</screen>
<screen name="AddBlogResponse">
- <section>
- <!--
+ <section>
+ <!--
<condition>
- <if-entity-permission entity-id="${ownerContentId}"
+ <if-entity-permission entity-id="${ownerContentId}"
entity-name="Content" target-operation="HAS_USER_ROLE" />
</condition>
- -->
+ -->
<actions>
<set field="rsp.contentTypeId" value="DOCUMENT" />
<set field="rsp.caContentAssocTypeId" value="RESPONSE" />
- <set field="rsp.drDataResourceTypeId"
+ <set field="rsp.drDataResourceTypeId"
value="ELECTRONIC_TEXT" />
- <set field="rsp.articleContentId"
+ <set field="rsp.articleContentId"
from-field="articleContentId" />
- <set field="rsp.caContentId"
+ <set field="rsp.caContentId"
from-field="parameters.contentId" />
- <set field="rsp.ownerContentId"
- from-field="ownerContentId" />
- <set field="useRequestParameters" value="false"
+ <set field="rsp.ownerContentId"
+ from-field="ownerContentId" />
+ <set field="useRequestParameters" value="false"
type="Boolean" />
</actions>
<widgets>
- <include-form name="AddBlogResponse"
+ <include-form name="AddBlogResponse"
location="component://ecommerce/widget/blog/BlogForms.xml" />
</widgets>
<fail-widgets>
- <label
+ <label
text="You must be logged in in order to post comments." />
</fail-widgets>
</section>
@@ -663,69 +665,69 @@
<screen name="EditBlogResponse">
<section>
<condition>
- <if-entity-permission entity-id="${ownerContentId}"
+ <if-entity-permission entity-id="${ownerContentId}"
entity-name="Content" target-operation="HAS_USER_ROLE" />
</condition>
<actions>
- <set field="rsp.articleContentId"
+ <set field="rsp.articleContentId"
from-field="articleContentId" />
- <entity-one entity-name="DataResource"
+ <entity-one entity-name="DataResource"
value-name="dataResource" use-cache="false">
- <field-map field-name="dataResourceId"
+ <field-map field-name="dataResourceId"
env-name="content.dataResourceId" />
</entity-one>
- <entity-one entity-name="ElectronicText"
+ <entity-one entity-name="ElectronicText"
value-name="electronicText" use-cache="false">
- <field-map field-name="dataResourceId"
+ <field-map field-name="dataResourceId"
env-name="content.dataResourceId" />
</entity-one>
</actions>
<widgets>
- <include-form name="EditBlogResponse"
+ <include-form name="EditBlogResponse"
location="component://ecommerce/widget/blog/BlogForms.xml" />
</widgets>
<fail-widgets>
- <label
+ <label
text="You must be logged in in order to post comments." />
</fail-widgets>
</section>
</screen>
- <!-- Column Included Screens -->
- <screen name="blogs">
- <section>
- <actions>
- <entity-condition entity-name="ContentAssocViewTo"
- list-name="blogs" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="contentIdStart"
- operator="equals" value="BLOGROOT" />
- <condition-list combine="or">
- <condition-expr field-name="caFromDate"
- operator="equals" env-name="null" />
- <condition-expr field-name="caFromDate"
- operator="less-equals" env-name="nowTimestamp" />
- </condition-list>
- <condition-list combine="or">
- <condition-expr field-name="caThruDate"
- operator="equals" env-name="null" />
- <condition-expr field-name="caThruDate"
- operator="greater-equals" env-name="nowTimestamp" />
- </condition-list>
- </condition-list>
- <order-by field-name="contentName" />
- </entity-condition>
- </actions>
- <widgets>
- <platform-specific>
- <html>
- <html-template
- location="component://ecommerce/webapp/ecommerce/blog/blogs.ftl" />
- </html>
- </platform-specific>
- </widgets>
- </section>
- </screen>
-
+ <!-- Column Included Screens -->
+ <screen name="blogs">
+ <section>
+ <actions>
+ <entity-condition entity-name="ContentAssocViewTo"
+ list-name="blogs" use-cache="true">
+ <condition-list combine="and">
+ <condition-expr field-name="contentIdStart"
+ operator="equals" value="BLOGROOT" />
+ <condition-list combine="or">
+ <condition-expr field-name="caFromDate"
+ operator="equals" env-name="null" />
+ <condition-expr field-name="caFromDate"
+ operator="less-equals" env-name="nowTimestamp" />
+ </condition-list>
+ <condition-list combine="or">
+ <condition-expr field-name="caThruDate"
+ operator="equals" env-name="null" />
+ <condition-expr field-name="caThruDate"
+ operator="greater-equals" env-name="nowTimestamp" />
+ </condition-list>
+ </condition-list>
+ <order-by field-name="contentName" />
+ </entity-condition>
+ </actions>
+ <widgets>
+ <platform-specific>
+ <html>
+ <html-template
+ location="component://ecommerce/webapp/ecommerce/blog/blogs.ftl" />
+ </html>
+ </platform-specific>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogTemplates.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogTemplates.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogTemplates.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogTemplates.xml Wed Jan 24 09:15:54 2007
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
--->
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/BlogTrees.xml Wed Jan 24 09:15:54 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<trees xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-tree.xsd">
<tree name="ResponseTree" root-node-name="node-root"
Modified: ofbiz/trunk/applications/ecommerce/widget/blog/textimage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/blog/textimage.ftl?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/blog/textimage.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/widget/blog/textimage.ftl Wed Jan 24 09:15:54 2007
@@ -1,116 +1,118 @@
-<#--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
--->
-<#--
-# This page displays both the textarea for text and the file upload control.
-# It was awkward to do it with screen widgets because need to show checkboxes
-# by each control.
--->
-<#-- This code sets the checkboxes based on existing data -->
-<#assign text_check=""/>
-<#assign img_check=""/>
-<#if (imageContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED") || drMimeTypeId?default("")?starts_with("image"))>
- <#assign img_check="checked"/>
-</#if>
-<#if (textContent?has_content && drMimeTypeId?default("")?starts_with("text"))
- || (textContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED"))
- || !img_check?has_content>
- <#assign text_check="checked"/>
-</#if>
-
-<#-- Sets one of the two templates -->
-<#assign topleft_check=""/>
-<#assign topcenter_check=""/>
-<#if view.drDataResourceId?has_content && view.drDataResourceId == "BLOG_TPL_TOPLEFT">
- <#assign topleft_check="checked"/>
-<#else>
- <#assign topcenter_check="checked"/>
-</#if>
-
-<#-- Fills in existing text -->
-<#assign textData=""/>
-<#if electronicText?has_content >
- <#if electronicText.textData?has_content >
- <#assign textData=electronicText.textData/>
- </#if>
-</#if>
-
-<#-- Stores the ids for existing data -->
-<#assign textContentId=""/>
-<#assign textDataResourceId=""/>
-<#if textContent?has_content >
- <#assign textContentId=textContent.contentId?if_exists/>
- <#assign textDataResourceId=textContent.drDataResourceId?if_exists/>
-</#if>
- <#if textElectronicText?has_content && textElectronicText.textData?has_content >
- <#assign textData=textElectronicText.textData/>
- </#if>
-<#assign imageContentId=""/>
-<#assign imageDataResourceId=""/>
-<#if imageContent?has_content >
- <#assign imageContentId=imageContent.contentId?if_exists/>
- <#assign imageDataResourceId=imageContent.drDataResourceId?if_exists/>
-</#if>
-
-<input type="hidden" name="textContentId" value="${textContentId}"/>
-<input type="hidden" name="imageContentId" value="${imageContentId}"/>
-<input type="hidden" name="textDataResourceId" value="${textDataResourceId}"/>
-<input type="hidden" name="imageDataResourceId" value="${imageDataResourceId}"/>
-<table>
-<tr>
-<td width="10%" align="right">
-<span class="treeHeader"> </span>
-</td>
-<td> </td>
-<td width="5%" align="left" valign="top">
-<div class="inputBox"><input type="checkBox" ${text_check} name="drMimeTypeId_TEXT" value="Y"/>Text</div>
-</td>
-<td> </td>
-<td width="60%" align="left"
-<textarea class="textAreaBox" class="inputBox" name="mainData" cols="60" rows="24">${textData?if_exists}</textarea>
-</td>
-<td width="10%" align="right">
-<span class="treeHeader"> </span>
-</td>
-</tr>
-
-<tr>
-<td width="10%" align="right">
-<span class="treeHeader"> </span>
-</td>
-<td> </td>
-<td width="5%" align="left" valign="top">
-<div class="inputBox"><input type="checkbox" ${img_check} name="drMimeTypeId_IMAGE" value="Y"/>Image</div>
-</td>
-<td> </td>
-<td width="60%" align="left">
- <div class="inputBox">Existing file name: <#if imageContent?has_content && imageContent.drObjectInfo?has_content>${imageContent.drObjectInfo}</#if></div>
- <br/>
-<input type="file" class="inputBox" name="imageData" size="25"/>
-<#--
- Force: <input type="checkbox" value="true" name="forceElectronicText"/>
- -->
- <br/>
- Top-left:<input type="radio" ${topleft_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPLEFT"/>
- Top-center:<input type="radio" ${topcenter_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPCENTER"/>
-</td>
-<td width="10%" align="right">
-<span class="treeHeader"> </span>
-</td>
-</tr>
-
-
-</table>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#--
+# This page displays both the textarea for text and the file upload control.
+# It was awkward to do it with screen widgets because need to show checkboxes
+# by each control.
+-->
+<#-- This code sets the checkboxes based on existing data -->
+<#assign text_check=""/>
+<#assign img_check=""/>
+<#if (imageContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED") || drMimeTypeId?default("")?starts_with("image"))>
+ <#assign img_check="checked"/>
+</#if>
+<#if (textContent?has_content && drMimeTypeId?default("")?starts_with("text"))
+ || (textContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED"))
+ || !img_check?has_content>
+ <#assign text_check="checked"/>
+</#if>
+
+<#-- Sets one of the two templates -->
+<#assign topleft_check=""/>
+<#assign topcenter_check=""/>
+<#if view.drDataResourceId?has_content && view.drDataResourceId == "BLOG_TPL_TOPLEFT">
+ <#assign topleft_check="checked"/>
+<#else>
+ <#assign topcenter_check="checked"/>
+</#if>
+
+<#-- Fills in existing text -->
+<#assign textData=""/>
+<#if electronicText?has_content >
+ <#if electronicText.textData?has_content >
+ <#assign textData=electronicText.textData/>
+ </#if>
+</#if>
+
+<#-- Stores the ids for existing data -->
+<#assign textContentId=""/>
+<#assign textDataResourceId=""/>
+<#if textContent?has_content >
+ <#assign textContentId=textContent.contentId?if_exists/>
+ <#assign textDataResourceId=textContent.drDataResourceId?if_exists/>
+</#if>
+ <#if textElectronicText?has_content && textElectronicText.textData?has_content >
+ <#assign textData=textElectronicText.textData/>
+ </#if>
+<#assign imageContentId=""/>
+<#assign imageDataResourceId=""/>
+<#if imageContent?has_content >
+ <#assign imageContentId=imageContent.contentId?if_exists/>
+ <#assign imageDataResourceId=imageContent.drDataResourceId?if_exists/>
+</#if>
+
+<input type="hidden" name="textContentId" value="${textContentId}"/>
+<input type="hidden" name="imageContentId" value="${imageContentId}"/>
+<input type="hidden" name="textDataResourceId" value="${textDataResourceId}"/>
+<input type="hidden" name="imageDataResourceId" value="${imageDataResourceId}"/>
+<table>
+<tr>
+<td width="10%" align="right">
+<span class="treeHeader"> </span>
+</td>
+<td> </td>
+<td width="5%" align="left" valign="top">
+<div class="inputBox"><input type="checkBox" ${text_check} name="drMimeTypeId_TEXT" value="Y"/>Text</div>
+</td>
+<td> </td>
+<td width="60%" align="left"
+<textarea class="textAreaBox" class="inputBox" name="mainData" cols="60" rows="24">${textData?if_exists}</textarea>
+</td>
+<td width="10%" align="right">
+<span class="treeHeader"> </span>
+</td>
+</tr>
+
+<tr>
+<td width="10%" align="right">
+<span class="treeHeader"> </span>
+</td>
+<td> </td>
+<td width="5%" align="left" valign="top">
+<div class="inputBox"><input type="checkbox" ${img_check} name="drMimeTypeId_IMAGE" value="Y"/>Image</div>
+</td>
+<td> </td>
+<td width="60%" align="left">
+ <div class="inputBox">Existing file name: <#if imageContent?has_content && imageContent.drObjectInfo?has_content>${imageContent.drObjectInfo}</#if></div>
+ <br/>
+<input type="file" class="inputBox" name="imageData" size="25"/>
+<#--
+ Force: <input type="checkbox" value="true" name="forceElectronicText"/>
+ -->
+ <br/>
+ Top-left:<input type="radio" ${topleft_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPLEFT"/>
+ Top-center:<input type="radio" ${topcenter_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPCENTER"/>
+</td>
+<td width="10%" align="right">
+<span class="treeHeader"> </span>
+</td>
+</tr>
+
+
+</table>
Modified: ofbiz/trunk/applications/humanres/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/build.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/humanres/build.xml (original)
+++ ofbiz/trunk/applications/humanres/build.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/trunk/applications/humanres/data/HumanResTypeData.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitygroup.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/humanres/entitydef/entitymodel.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/humanres/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/ofbiz-component.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/humanres/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/humanres/ofbiz-component.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/build.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/build.xml (original)
+++ ofbiz/trunk/applications/manufacturing/build.xml Wed Jan 24 09:15:54 2007
@@ -1,17 +1,20 @@
<?xml version="1.0"?>
<!--
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml (original)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingData.xml Wed Jan 24 09:15:54 2007
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingExampleData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingExampleData.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingExampleData.xml (original)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingExampleData.xml Wed Jan 24 09:15:54 2007
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingScheduledServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingScheduledServices.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingScheduledServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingScheduledServices.xml Wed Jan 24 09:15:54 2007
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml (original)
+++ ofbiz/trunk/applications/manufacturing/data/ManufacturingSecurityData.xml Wed Jan 24 09:15:54 2007
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/entitydef/entitygroup.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/entitydef/entitygroup.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/entitydef/entitygroup.xml (original)
+++ ofbiz/trunk/applications/manufacturing/entitydef/entitygroup.xml Wed Jan 24 09:15:54 2007
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->
Modified: ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml?view=diff&rev=499486&r1=499485&r2=499486
==============================================================================
--- ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/manufacturing/entitydef/entitymodel.xml Wed Jan 24 09:15:54 2007
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
under the License.
-->