You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/08/18 12:01:46 UTC
svn commit: r805338 [3/3] - in /ofbiz/trunk/applications: accounting/data/
accounting/data/helpdata/ content/ content/data/ content/data/helpdata/
content/dtd/ content/entitydef/ content/src/org/ofbiz/content/content/
content/widget/content/ product/da...
Propchange: ofbiz/trunk/applications/content/dtd/docbook.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/content/dtd/docbook.xsd
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/content/dtd/docbook.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xsd
Added: ofbiz/trunk/applications/content/dtd/xlink.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/dtd/xlink.xsd?rev=805338&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/dtd/xlink.xsd (added)
+++ ofbiz/trunk/applications/content/dtd/xlink.xsd Tue Aug 18 10:01:45 2009
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:docbook="http://docbook.org/ns/docbook">
+ <xs:attribute name="href"/>
+ <xs:attribute name="type"/>
+ <xs:attribute name="role"/>
+ <xs:attribute name="arcrole"/>
+ <xs:attribute name="title"/>
+ <xs:attribute name="show">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="new"/>
+ <xs:enumeration value="replace"/>
+ <xs:enumeration value="embed"/>
+ <xs:enumeration value="other"/>
+ <xs:enumeration value="none"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="actuate">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="onLoad"/>
+ <xs:enumeration value="onRequest"/>
+ <xs:enumeration value="other"/>
+ <xs:enumeration value="none"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="label" type="xs:NMTOKEN"/>
+ <xs:attribute name="from" type="xs:NMTOKEN"/>
+ <xs:attribute name="to" type="xs:NMTOKEN"/>
+</xs:schema>
Propchange: ofbiz/trunk/applications/content/dtd/xlink.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/content/dtd/xlink.xsd
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/content/dtd/xlink.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xsd
Added: ofbiz/trunk/applications/content/dtd/xml.xsd
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/dtd/xml.xsd?rev=805338&view=auto
==============================================================================
--- ofbiz/trunk/applications/content/dtd/xml.xsd (added)
+++ ofbiz/trunk/applications/content/dtd/xml.xsd Tue Aug 18 10:01:45 2009
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:docbook="http://docbook.org/ns/docbook">
+ <xs:attribute name="id" type="xs:ID"/>
+ <xs:attribute name="lang"/>
+ <xs:attribute name="base"/>
+ <xs:attribute name="space">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="preserve"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+</xs:schema>
Propchange: ofbiz/trunk/applications/content/dtd/xml.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/content/dtd/xml.xsd
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/content/dtd/xml.xsd
------------------------------------------------------------------------------
svn:mime-type = text/xsd
Modified: ofbiz/trunk/applications/content/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/entitydef/entitymodel.xml?rev=805338&r1=805337&r2=805338&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/content/entitydef/entitymodel.xml Tue Aug 18 10:01:45 2009
@@ -228,9 +228,6 @@
<relation type="many" rel-entity-name="ContentAssocDataResourceViewTo">
<key-map field-name="contentId" rel-field-name="contentIdStart"/>
</relation>
- <index name="contentName">
- <index-field name="contentName"/>
- </index>
</entity>
<view-entity entity-name="ContentAndRole" package-name="org.ofbiz.content.content" title="Content And Role View Entity">
<member-entity entity-alias="CNT" entity-name="Content"/>
Modified: ofbiz/trunk/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/ofbiz-component.xml?rev=805338&r1=805337&r2=805338&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/ofbiz-component.xml (original)
+++ ofbiz/trunk/applications/content/ofbiz-component.xml Tue Aug 18 10:01:45 2009
@@ -47,6 +47,7 @@
<entity-resource type="data" reader-name="demo" loader="main" location="data/WebSitePublishPointData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/CompDocData.xml"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/ForumDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/DocBookDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_content.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_contenttypes.xml"/>
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=805338&r1=805337&r2=805338&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Tue Aug 18 10:01:45 2009
@@ -275,7 +275,7 @@
throw new GeneralException(e.getMessage());
}
- // using FTL to handle XML? not really sure what this is doing...
+ // This part is using an xml file as the input data and an ftl file to present it.
if (UtilValidate.isNotEmpty(mimeType)) {
if (mimeType.toLowerCase().indexOf("xml") >= 0) {
StringReader sr = new StringReader(textData);
Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=805338&r1=805337&r2=805338&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Tue Aug 18 10:01:45 2009
@@ -567,10 +567,7 @@
<set field="mimeTypeId" from-field="dataResource.mimeTypeId"/>
</row-actions>
<field name="contentId">
- <hyperlink also-hidden="false" description="${content.contentName} [${content.contentId}]" target="ViewSimpleContent">
- <parameter param-name="contentId" from-field="content.contentId"/>
- <parameter param-name="dataResourceId" from-field="content.dataResourceId"/>
- </hyperlink>
+ <hyperlink also-hidden="false" description="${content.contentName} [${content.contentId}]" target="views/ShowDocument?contentId=${content.contentId}"/>
</field>
<field name="contentTypeId">
<display-entity entity-name="ContentType" key-field-name="contentTypeId" description="${description}"/>
Modified: ofbiz/trunk/applications/product/data/ProductHelpData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductHelpData.xml?rev=805338&r1=805337&r2=805338&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductHelpData.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductHelpData.xml Tue Aug 18 10:01:45 2009
@@ -18,24 +18,7 @@
under the License.
-->
<entity-engine-xml>
- <!-- =======Help=========== -->
- <DataResource dataResourceId="HELP_PRODUCT" localeString="en" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Catalog Manager Help" mimeTypeId="text/xml" isPublic="Y" />
- <ElectronicText dataResourceId="HELP_PRODUCT">
- <textData><![CDATA[
- <root>
- <generalTitle>
- The Catalog Manager.
- </generalTitle>
- <general>
- <section>
- <text>
- The Catalog Manager creates and provides access to a variety of information related to Products, Catalogs, or Categories.
- </text>
- </section>
- </general>
- </root>
- ]]></textData>
- </ElectronicText>
- <Content contentId="HELP_PRODUCT" contentTypeId="DOCUMENT" contentName="Catalog Manager Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
+ <DataResource dataResourceId="HELP_PRODUCT" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/product/data/helpdata/HELP_PRODUCT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system Product" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="HELP_PRODUCT" contentTypeId="DOCUMENT" localeString="en" contentName="Catalog Manager Help" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_PRODUCT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/>/>
<ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_PRODUCT" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="020"/>
</entity-engine-xml>
Added: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml?rev=805338&view=auto
==============================================================================
--- ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml (added)
+++ ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml Tue Aug 18 10:01:45 2009
@@ -0,0 +1,31 @@
+<?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.
+-->
+<root>
+ <generalTitle>
+ The Catalog Manager.
+ </generalTitle>
+ <general>
+ <section>
+ <text>
+ The Catalog Manager creates and provides access to a variety of information related to Products, Catalogs, or Categories.
+ </text>
+ </section>
+ </general>
+</root>
Propchange: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/data/helpdata/HELP_PRODUCT.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml