svn commit: r1778271 [1/2] - in /ofbiz/trunk: ./ applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/datamodel/ framework/base/config/ framework/base/dtd/ framework/base/src/main/java/o
Locked
svn commit: r1778271 [1/2] - in /ofbiz/trunk: ./ applications/accounting/data/ applications/commonext/data/ applications/content/data/ applications/datamodel/ framework/base/config/ framework/base/dtd/ framework/base/src/main/java/o
 
|
Author: taher
Date: Wed Jan 11 10:48:47 2017 New Revision: 1778271 URL: http://svn.apache.org/viewvc?rev=1778271&view=rev Log: Implemented: renamed the directory specialpurpose to plugins (OFBIZ-7972) In another step towards completing the plugin system for OFBiz, we renamed the /specialpurpose directory to /plugins and changed all occurences of the word "specialpurpose" to "plugins" in all files found in the system Reference discussion: http://markmail.org/message/hpyuxkmftiyn44w2 Added: ofbiz/trunk/plugins/ - copied from r1778270, ofbiz/trunk/specialpurpose/ Removed: ofbiz/trunk/specialpurpose/ Modified: ofbiz/trunk/.gitignore ofbiz/trunk/.hgignore ofbiz/trunk/LICENSE ofbiz/trunk/README.md ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml ofbiz/trunk/applications/datamodel/README.md ofbiz/trunk/build.gradle ofbiz/trunk/common.gradle ofbiz/trunk/framework/base/config/component-load.xml ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java ofbiz/trunk/framework/documents/SingleSignOn.xml ofbiz/trunk/hot-deploy/README.txt ofbiz/trunk/plugins/assetmaint/README.md ofbiz/trunk/plugins/assetmaint/entitydef/entitymodel.xml ofbiz/trunk/plugins/birt/README.md ofbiz/trunk/plugins/birt/data/BirtHelpData.xml ofbiz/trunk/plugins/birt/documents/Birt.xml ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml ofbiz/trunk/plugins/cmssite/data/CmsSiteDemoData.xml ofbiz/trunk/plugins/ebay/data/EbayHelpData.xml ofbiz/trunk/plugins/ebay/data/helpdata/HELP_EBAY_main.xml ofbiz/trunk/plugins/ebaystore/README ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml ofbiz/trunk/plugins/example/config/ExampleUiLabels.xml ofbiz/trunk/plugins/example/data/ExampleHelpData.xml ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleScreens.xml ofbiz/trunk/plugins/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java ofbiz/trunk/plugins/lucene/README.md ofbiz/trunk/plugins/myportal/README.md ofbiz/trunk/plugins/myportal/data/MyPortalPageDemoData.xml ofbiz/trunk/plugins/passport/README.md ofbiz/trunk/plugins/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java ofbiz/trunk/plugins/projectmgr/README.md ofbiz/trunk/plugins/projectmgr/data/ProjectMgrHelpData.xml ofbiz/trunk/plugins/projectmgr/entitydef/entitymodel.xml ofbiz/trunk/plugins/scrum/README.md ofbiz/trunk/plugins/scrum/data/scrumHelpData.xml ofbiz/trunk/plugins/solr/README.md ofbiz/trunk/plugins/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java ofbiz/trunk/plugins/webpos/data/PosSyncSettings.xml ofbiz/trunk/plugins/webpos/entitydef/entitymodel.xml ofbiz/trunk/tools/documentation/README.md.html Modified: ofbiz/trunk/.gitignore URL: http://svn.apache.org/viewvc/ofbiz/trunk/.gitignore?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/.gitignore (original) +++ ofbiz/trunk/.gitignore Wed Jan 11 10:48:47 2017 @@ -3,7 +3,7 @@ build/ applications/*/build framework/*/build hot-deploy/*/build -specialpurpose/*/build +plugins/*/build runtime/git-rebase/* runtime/SvnInfo.ftl runtime/GitInfo.ftl Modified: ofbiz/trunk/.hgignore URL: http://svn.apache.org/viewvc/ofbiz/trunk/.hgignore?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/.hgignore (original) +++ ofbiz/trunk/.hgignore Wed Jan 11 10:48:47 2017 @@ -1,5 +1,5 @@ syntax: regexp -^(framework|applications|specialpurpose)/[^/]+/build/.*$ +^(framework|applications|plugins)/[^/]+/build/.*$ ^ofbiz\.jar$ ^runtime/data/derby/.*$ ^runtime/logs/.*(log|html)(|.\d+)$ Modified: ofbiz/trunk/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/LICENSE (original) +++ ofbiz/trunk/LICENSE Wed Jan 11 10:48:47 2017 @@ -225,8 +225,8 @@ under the "MIT" license. For details, se This product bundles "jQuery" and "jQuery" plugins and extensions, which are available under the "MIT" license. For details, see: framework/images/webapp/images/jquery/ -specialpurpose/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js -specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js +plugins/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js +plugins/webpos/webapp/webpos/images/js/WebPosHotkeys.js ========================================================================= @@ -239,15 +239,15 @@ For details, see framework/images/webapp This product bundles files from the "Birt" technology platform (www.eclipse.org/birt/) which are available under the "Eclipse Public License - v 1.0". -For details, see specialpurpose/birt/webapp/birt/webcontent/birt/ +For details, see plugins/birt/webapp/birt/webcontent/birt/ ========================================================================= This product bundles "Webhelp for DocBook", which is available -under the "MIT" License. For details, see specialpurpose/cmssite/template/docbook/webhelp/ +under the "MIT" License. For details, see plugins/cmssite/template/docbook/webhelp/ ========================================================================= This product bundles "DocBook XSL Stylesheets 1.77.1", which is available under the "MIT" license. -For details, see specialpurpose/cmssite/template/docbook/ +For details, see plugins/cmssite/template/docbook/ Modified: ofbiz/trunk/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/README.md (original) +++ ofbiz/trunk/README.md Wed Jan 11 10:48:47 2017 @@ -480,7 +480,7 @@ OFBiz plugin system ------------------- OFBiz provides an extension mechanism through plugins. Plugins are standard -OFBiz components that reside in the specialpurpose directory. Plugins can be +OFBiz components that reside in the plugins directory. Plugins can be added manually or fetched from a maven repository. The standard tasks for managing plugins are listed below. @@ -508,14 +508,14 @@ If you have a plugin called mycustomplug below instructions: - Extract the plugin if it is compressed -- Place the extracted directory into /specialpurpose +- Place the extracted directory into /plugins - Run the below command `gradlew installPlugin -PpluginId=myplugin` The above commands achieve the following: -- add the plugin to /specialpurpose/component-load.xml +- add the plugin to /plugins/component-load.xml - executes the task "install" in the plugin's build.gradle file if it exists ### Uninstall a plugin @@ -528,7 +528,7 @@ run the below command The above commands achieve the following: - executes the task "uninstall" in the plugin's build.gradle file if it exists -- removes the plugin from /specialpurpose/component-load.xml +- removes the plugin from /plugins/component-load.xml ### Remove a plugin @@ -551,8 +551,8 @@ Create a new plugin. The following proje The above commands achieve the following: -- create a new plugin in /specialpurpose/myplugin -- add the plugin to /specialpurpose/component-load.xml +- create a new plugin in /plugins/myplugin +- add the plugin to /plugins/component-load.xml ### Push a plugin to a repository Modified: ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml (original) +++ ofbiz/trunk/applications/accounting/data/DemoPaymentsInvoices.xml Wed Jan 11 10:48:47 2017 @@ -76,7 +76,7 @@ under the License. <InvoiceItem invoiceId="8001" invoiceItemSeqId="1" invoiceItemTypeId="PINV_SURCHARGE_ADJ" taxableFlag="Y" quantity="1.000000" amount="10.000"/> <!-- - specialpurpose components are loaded after applications components. DemoSupplier & AcctBigSupplier data exists in ecommerce component. + plugins components are loaded after applications components. DemoSupplier & AcctBigSupplier data exists in ecommerce component. So it creates foreign key violation as accounting component is loaded first and it tries to find 'DemoSupplier' and 'AcctBigSupplier' party. This change will help to load test data without producing any foreign key error. --> Modified: ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml (original) +++ ofbiz/trunk/applications/commonext/data/EntityDiagramGroupData.xml Wed Jan 11 10:48:47 2017 @@ -261,6 +261,6 @@ under the License. <EntityGroupEntry entityGroupId="6930" entityOrPackage="org.apache.ofbiz.security" applEnumId="ESIA_INCLUDE"/> - <EntityGroup entityGroupId="6990" entityGroupName="Technical: WebPOS, OAGIS, Other"/> - <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.pos.terminal" applEnumId="ESIA_INCLUDE"/> - <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.specialpurpose.oagis" applEnumId="ESIA_INCLUDE"/> + <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.plugins.oagis" applEnumId="ESIA_INCLUDE"/> <EntityGroupEntry entityGroupId="6990" entityOrPackage="org.apache.ofbiz.catalina.session" applEnumId="ESIA_INCLUDE"/> </entity-engine-xml> Modified: ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml (original) +++ ofbiz/trunk/applications/content/data/DemoBlogEntryData.xml Wed Jan 11 10:48:47 2017 @@ -19,7 +19,7 @@ --> <entity-engine-xml> <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" isPublic="Y" createdByUserLogin="admin" createdDate="2004-01-16 01:24:06.522" lastModifiedByUserLogin="admin" lastModifiedDate="2010-09-26 13:13:32.482" mimeTypeId="application/octet-stream" statusId="CTNT_PUBLISHED"/> - <DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" mimeTypeId="image/jpeg" objectInfo="specialpurpose/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal"/> + <DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" mimeTypeId="image/jpeg" objectInfo="plugins/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal"/> <DataResource dataResourceId="BLG10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:46:22.984" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.671" lastModifiedByUserLogin="bigal"/> <DataResource dataResourceId="BLG10003" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:47:49.343" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:47:49.343" lastModifiedByUserLogin="bigal"/> <DataResource dataResourceId="BLG10004" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="CTNT_PUBLISHED" createdDate="2007-01-23 16:50:38.171" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:50:38.171" lastModifiedByUserLogin="blog_guest"/> Modified: ofbiz/trunk/applications/datamodel/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/datamodel/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/applications/datamodel/README.md (original) +++ ofbiz/trunk/applications/datamodel/README.md Wed Jan 11 10:48:47 2017 @@ -1,7 +1,7 @@ <img src="http://ofbiz.apache.org/images/logo.png" alt="Apache OFBiz" /> # Datamodel component -This OFBiz component contains all entity definitions used in the various components in the base and specialpurpose stack. +This OFBiz component contains all entity definitions used in the various components in the base and plugins stack. ## more information For more information about this component visit the product page in the OFBiz WIKI, Modified: ofbiz/trunk/build.gradle URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.gradle?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/build.gradle (original) +++ ofbiz/trunk/build.gradle Wed Jan 11 10:48:47 2017 @@ -30,7 +30,7 @@ apply from: 'common.gradle' // global properties ext.os = System.getProperty('os.name').toLowerCase() -ext.pluginsDir = "${rootDir}/specialpurpose" +ext.pluginsDir = "${rootDir}/plugins" // java settings def jvmArguments = ['-Xms128M', '-Xmx1024M'] @@ -258,7 +258,7 @@ eclipse.classpath.file.whenMerged { clas entry.path ==~ '.*/+(' + componentName.tokenize(osDirSeparator).last() + ')$' || entry.path ==~ /(\/+framework)$/ || entry.path ==~ /(\/+applications)$/ || - entry.path ==~ /(\/+specialpurpose)$/ || + entry.path ==~ /(\/+plugins)$/ || entry.path ==~ /(\/+themes)$/ || entry.path ==~ /(\/+hot-deploy)$/ || entry.path ==~ eclipseEntry + '/config' || @@ -590,9 +590,9 @@ task installPlugin(group: ofbizPlugin, d } if (project.hasProperty('pluginId')) { - if (subprojectExists(":specialpurpose:${pluginId}")) { - if (taskExistsInproject(":specialpurpose:${pluginId}", 'install')) { - dependsOn ":specialpurpose:${pluginId}:install" + if (subprojectExists(":plugins:${pluginId}")) { + if (taskExistsInproject(":plugins:${pluginId}", 'install')) { + dependsOn ":plugins:${pluginId}:install" doLast { println "installed plugin ${pluginId}" } } else { doLast { println "No install task defined for plugin ${pluginId}" } @@ -615,13 +615,13 @@ task uninstallPlugin(group: ofbizPlugin, if (!project.hasProperty('pluginId')) { throw new GradleException('Missing property \"pluginId\"') } - if (!subprojectExists(":specialpurpose:${pluginId}")) { + if (!subprojectExists(":plugins:${pluginId}")) { throw new GradleException("Plugin \"${pluginId}\" does not exist") } } - if (project.hasProperty('pluginId') && taskExistsInproject(":specialpurpose:${pluginId}", 'uninstall')) { - dependsOn ":specialpurpose:${pluginId}:uninstall" + if (project.hasProperty('pluginId') && taskExistsInproject(":plugins:${pluginId}", 'uninstall')) { + dependsOn ":plugins:${pluginId}:uninstall" } doLast { @@ -630,7 +630,7 @@ task uninstallPlugin(group: ofbizPlugin, } task removePlugin(group: ofbizPlugin, description: 'Uninstall a plugin and delete its files') { - if (project.hasProperty('pluginId') && subprojectExists(":specialpurpose:${pluginId}")) { + if (project.hasProperty('pluginId') && subprojectExists(":plugins:${pluginId}")) { dependsOn uninstallPlugin } @@ -647,7 +647,7 @@ task pushPlugin(group: ofbizPlugin, desc if (project.hasProperty('pluginId')) { doFirst { - if (!subprojectExists(":specialpurpose:${pluginId}")) { + if (!subprojectExists(":plugins:${pluginId}")) { throw new GradleException("Plugin ${pluginId} does not exist, cannot publish") } } @@ -675,7 +675,7 @@ task pushPlugin(group: ofbizPlugin, desc } } - if (subprojectExists(":specialpurpose:${pluginId}")) { + if (subprojectExists(":plugins:${pluginId}")) { dependsOn publishToMavenLocal } @@ -778,7 +778,7 @@ task cleanAnt(group: cleanupGroup, type: /* TODO this task is temporary and should be deleted after some * time when users have updated their trees. */ doLast { - ['framework', 'specialpurpose', 'applications'].each { componentGroup -> + ['framework', 'plugins', 'applications'].each { componentGroup -> file(componentGroup).eachDir { component -> delete file(component.toString() + '/build') } Modified: ofbiz/trunk/common.gradle URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.gradle?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/common.gradle (original) +++ ofbiz/trunk/common.gradle Wed Jan 11 10:48:47 2017 @@ -19,7 +19,7 @@ def iterateOverActiveComponents(applyFunction) { def frameworkComponents = new XmlParser().parse("${rootDir}/framework/component-load.xml") def applicationsComponents = new XmlParser().parse("${rootDir}/applications/component-load.xml") - def specialpurposeComponents = new XmlParser().parse("${rootDir}/specialpurpose/component-load.xml") + def pluginsComponents = new XmlParser().parse("${rootDir}/plugins/component-load.xml") applyFunction file("${rootDir}/framework/start") @@ -29,8 +29,8 @@ def iterateOverActiveComponents(applyFun applicationsComponents.children().each { component -> applyFunction file("${rootDir}/applications/"+component.@"component-location") } - specialpurposeComponents.children().each { component -> - applyFunction file("${rootDir}/specialpurpose/"+component.@"component-location") + pluginsComponents.children().each { component -> + applyFunction file("${rootDir}/plugins/"+component.@"component-location") } file("${rootDir}/themes").eachDir { component -> Modified: ofbiz/trunk/framework/base/config/component-load.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/component-load.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/framework/base/config/component-load.xml (original) +++ ofbiz/trunk/framework/base/config/component-load.xml Wed Jan 11 10:48:47 2017 @@ -23,6 +23,6 @@ under the License. <load-components parent-directory="framework"/> <load-components parent-directory="themes"/> <load-components parent-directory="applications"/> - <load-components parent-directory="specialpurpose"/> + <load-components parent-directory="plugins"/> <load-components parent-directory="hot-deploy"/> </component-loader> Modified: ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd (original) +++ ofbiz/trunk/framework/base/dtd/ofbiz-component.xsd Wed Jan 11 10:48:47 2017 @@ -196,7 +196,7 @@ under the License. <xs:annotation> <xs:documentation> This value determines in which application menu the application is shown. - For instance "secondary" is used by specialpurpose and webtools webapps to put their menu-names in the second menu. + For instance "secondary" is used by plugins and webtools webapps to put their menu-names in the second menu. Note that not all OOTB themes use this "secondary" option, for instance Flat-Grey does not. </xs:documentation> </xs:annotation> Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilProperties.java Wed Jan 11 10:48:47 2017 @@ -519,7 +519,7 @@ public final class UtilProperties implem +"# Dynamically modified by OFBiz Framework (org.apache.ofbiz.base.util : UtilProperties.setPropertyValue)\n" +"# \n" +"# By default the screen is 1024x768 wide. If you want to use another screen size,\n" - +"# you must create a new directory under specialpurpose/pos/screens, like the 800x600.\n" + +"# you must create a new directory under plugins/pos/screens, like the 800x600.\n" +"# You must also set the 3 related parameters (StartClass, ClientWidth, ClientHeight) accordingly.\n" +"#"); } else { Modified: ofbiz/trunk/framework/documents/SingleSignOn.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/documents/SingleSignOn.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/framework/documents/SingleSignOn.xml (original) +++ ofbiz/trunk/framework/documents/SingleSignOn.xml Wed Jan 11 10:48:47 2017 @@ -123,12 +123,12 @@ <section> <title>LDAP Component</title> <para> - OFBiz uses the LDAP component in the specialpurpose to check the security in a web application. OFBiz disabled LDAP component as default, you can enable this component by take the comment out from specialpurpose/component-load.xml file. + OFBiz uses the LDAP component in the plugins to check the security in a web application. OFBiz disabled LDAP component as default, you can enable this component by take the comment out from plugins/component-load.xml file. </para> <section> <title>LDAP Properties</title> <para> - LDAP properties file is specialpurpose/ldap/config/ldap.xml. You can change a filter condition you want. + LDAP properties file is plugins/ldap/config/ldap.xml. You can change a filter condition you want. </para> <section> <title>Attributes</title> Modified: ofbiz/trunk/hot-deploy/README.txt URL: http://svn.apache.org/viewvc/ofbiz/trunk/hot-deploy/README.txt?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/hot-deploy/README.txt (original) +++ ofbiz/trunk/hot-deploy/README.txt Wed Jan 11 10:48:47 2017 @@ -4,7 +4,7 @@ All components in this tree will be load framework themes applications -specialpurpose +plugins The hot-deploy Auto-Loading feature loads all components in the order they are found (i.e. alphabetic or creation date). Modified: ofbiz/trunk/plugins/assetmaint/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/assetmaint/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/assetmaint/README.md (original) +++ ofbiz/trunk/plugins/assetmaint/README.md Wed Jan 11 10:48:47 2017 @@ -17,4 +17,4 @@ JIRA issues related to this component ca ## commits Committed revisions can be viewed at -http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/ \ No newline at end of file +http://svn.apache.org/viewvc/ofbiz/trunk/plugins/assetmaint/ \ No newline at end of file Modified: ofbiz/trunk/plugins/assetmaint/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/assetmaint/entitydef/entitymodel.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/assetmaint/entitydef/entitymodel.xml (original) +++ ofbiz/trunk/plugins/assetmaint/entitydef/entitymodel.xml Wed Jan 11 10:48:47 2017 @@ -28,7 +28,7 @@ <description>None</description> <version>1.0</version> - <view-entity entity-name="FixedAssetAndIdent" package-name="org.apache.ofbiz.specialpurpose.assetmaint" + <view-entity entity-name="FixedAssetAndIdent" package-name="org.apache.ofbiz.plugins.assetmaint" title="FixedAsset and FixedAssetIdent View Entity"> <member-entity entity-alias="FA" entity-name="FixedAsset"/> <member-entity entity-alias="FAI" entity-name="FixedAssetIdent"/> @@ -39,7 +39,7 @@ </view-link> </view-entity> <view-entity entity-name="FixedAssetMaintWorkEffortAndPartyAssignment" - package-name="org.apache.ofbiz.specialpurpose.assetmaint" + package-name="org.apache.ofbiz.plugins.assetmaint" title="View of FixedAssetMaint and WorkEffort and WorkEffortPartyAssignment"> <member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/> <member-entity entity-alias="WE" entity-name="WorkEffort"/> @@ -67,7 +67,7 @@ </relation> </view-entity> <view-entity entity-name="FixedAssetMaintWorkEffortAndTimeEntry" - package-name="org.apache.ofbiz.specialpurpose.assetmaint" + package-name="org.apache.ofbiz.plugins.assetmaint" title="View of FixedAssetMaint and WorkEffort and TimeEntry"> <member-entity entity-alias="FAM" entity-name="FixedAssetMaint"/> <member-entity entity-alias="WE" entity-name="WorkEffort"/> @@ -91,7 +91,7 @@ </relation> </view-entity> <view-entity entity-name="ItemIssuanceInventoryItemAndProduct" - package-name="org.apache.ofbiz.specialpurpose.assetmaint" + package-name="org.apache.ofbiz.plugins.assetmaint" title="View of Item Issuance,Inventory Item and Product"> <member-entity entity-alias="IMIE" entity-name="ItemIssuance"/> <member-entity entity-alias="IYIM" entity-name="InventoryItem"/> @@ -131,7 +131,7 @@ </relation> </view-entity> <view-entity entity-name="ProductInventoryItemAndItemIssuance" - package-name="org.apache.ofbiz.specialpurpose.assetmaint" + package-name="org.apache.ofbiz.plugins.assetmaint" title="View of Product,Inventory Item and ItemIssuance"> <member-entity entity-alias="PT" entity-name="Product"/> <member-entity entity-alias="IYIM" entity-name="InventoryItem"/> Modified: ofbiz/trunk/plugins/birt/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/birt/README.md (original) +++ ofbiz/trunk/plugins/birt/README.md Wed Jan 11 10:48:47 2017 @@ -2,4 +2,4 @@ # Birt component ## more informationFor more information about this component visit the page in the OFBiz WIKI, which can be found at https://cwiki.apache.org/confluence/display/OFBIZ/Using+BIRT+with+OFBizMore information about the birt product can be found at: http://www.eclipse.org/birt/ ## IssuesJIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12321022 -## commitsCommitted revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bith/ \ No newline at end of file +## commitsCommitted revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/plugins/bith/ \ No newline at end of file Modified: ofbiz/trunk/plugins/birt/data/BirtHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/data/BirtHelpData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/birt/data/BirtHelpData.xml (original) +++ ofbiz/trunk/plugins/birt/data/BirtHelpData.xml Wed Jan 11 10:48:47 2017 @@ -20,7 +20,7 @@ <entity-engine-xml> <DataResource dataResourceId="HELP_BIRT" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/birt/data/helpdata/HELP_BIRT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="plugins/birt/data/helpdata/HELP_BIRT.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="BIRT" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_BIRT" contentTypeId="DOCUMENT" contentName="BIRT Overview" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_BIRT" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> Modified: ofbiz/trunk/plugins/birt/documents/Birt.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/documents/Birt.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/birt/documents/Birt.xml (original) +++ ofbiz/trunk/plugins/birt/documents/Birt.xml Wed Jan 11 10:48:47 2017 @@ -24,6 +24,6 @@ <title>BIRT report generator.</title> <para> An example report sales can be found in the example component. </para> <para> - <xi:include href="../../../specialpurpose/birt/data/helpdata/HELP_BIRT.xml"/> + <xi:include href="../../../plugins/birt/data/helpdata/HELP_BIRT.xml"/> </para> </chapter> Modified: ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml (original) +++ ofbiz/trunk/plugins/birt/webapp/birt/WEB-INF/web.xml Wed Jan 11 10:48:47 2017 @@ -113,7 +113,7 @@ under the License. --> <context-param> <param-name>BIRT_VIEWER_SCRIPTLIB_DIR</param-name> - <param-value>${ofbiz.home}/specialpurpose/birt/lib/scriptlib</param-value> + <param-value>${ofbiz.home}/plugins/birt/lib/scriptlib</param-value> </context-param> <!-- Resource location directory. Defaults to ${birt home} --> Modified: ofbiz/trunk/plugins/cmssite/data/CmsSiteDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/cmssite/data/CmsSiteDemoData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/cmssite/data/CmsSiteDemoData.xml (original) +++ ofbiz/trunk/plugins/cmssite/data/CmsSiteDemoData.xml Wed Jan 11 10:48:47 2017 @@ -206,23 +206,23 @@ under the License. <WebSiteContent webSiteId="OfbizSite" contentId="OFBIZ_HOME" webSiteContentTypeId="DEFAULT_PAGE" fromDate="2001-01-01 00:00:00"/> <!-- documents website --> - <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> - <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> + <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> + <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/> <DataResource dataResourceId="PUBLIC_DOCS" dataResourceTypeId="URL_RESOURCE" dataTemplateTypeId="SCREEN_COMBINED" objectInfo="component://cmssite/widget/CmssiteScreens.xml#publicDocs"/> <Content contentId="PUBLIC_DOCS" contentTypeId="DOCUMENT" contentName="OFBIz public documents" dataResourceId="PUBLIC_DOCS"/> - <DataResource dataResourceId="APACHE_OFBIZ" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/documents/ApacheOfbiz.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" /> + <DataResource dataResourceId="APACHE_OFBIZ" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/documents/ApacheOfbiz.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="APACHE_OFBIZ_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The User & Technical Apache OFBiz document in one page HTML" mimeTypeId="text/html"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/> <Content contentId="APACHE_OFBIZ_PDF" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_PDF_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The general Apache document in PDF format" mimeTypeId="application/pdf"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/> - <DataResource dataResourceId="APACHE_OFBIZ_TECH" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/documents/ApacheOfbizTechnical.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" /> + <DataResource dataResourceId="APACHE_OFBIZ_TECH" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/documents/ApacheOfbizTechnical.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="APACHE_OFBIZ_T_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_TECH" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBiz Technical Guide in one page HTML" mimeTypeId="text/html"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_T_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/> - <DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="specialpurpose/cmssite/documents/ApacheOfbizUser.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz User document" mimeTypeId="text/xml" isPublic="Y" /> + <DataResource dataResourceId="APACHE_OFBIZ_USER" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="plugins/cmssite/documents/ApacheOfbizUser.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz User document" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="APACHE_OFBIZ_U_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ_USER" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The Apache OFBizUser Guide in one page HTML" mimeTypeId="text/html"/> <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_U_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/> Modified: ofbiz/trunk/plugins/ebay/data/EbayHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ebay/data/EbayHelpData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/ebay/data/EbayHelpData.xml (original) +++ ofbiz/trunk/plugins/ebay/data/EbayHelpData.xml Wed Jan 11 10:48:47 2017 @@ -19,7 +19,7 @@ under the License. --> <entity-engine-xml> <DataResource dataResourceId="HELP_EBAY" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_EBAY" contentTypeId="DOCUMENT" contentName="Ebay" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_EBAY" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> @@ -27,60 +27,60 @@ under the License. <!-- options --> <DataResource dataResourceId="EBAY_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_main" contentTypeId="DOCUMENT" contentName="Ebay Main." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_main" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_main"/> <!-- features --> <DataResource dataResourceId="EBAY_Features" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_Features.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_Features.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_Features" contentTypeId="DOCUMENT" contentName="Ebay features." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_Features" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_Features" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> <!-- --> <DataResource dataResourceId="EBAY_FindEbayConfig" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_FindConfigurations.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_FindEbayConfig" contentTypeId="DOCUMENT" contentName="Ebay find configurations." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_FindEbayConfig" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_FindEbayConfig" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_FindEbayConfigurations"/> <DataResource dataResourceId="EBAY_EditEbayConfig" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_EditEbayConfiguration.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_EditEbayConfig" contentTypeId="DOCUMENT" contentName="Ebay edit configurations." templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_EditEbayConfig" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_EditEbayConfig" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_EditEbayConfiguration"/> <DataResource dataResourceId="EBAY_AddEbayConfig" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_AddEbayConfiguration.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_AddEbayConfiguration.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_AddEbayConfig" contentTypeId="DOCUMENT" contentName="EBAY_AddEbayConfig" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AddEbayConfig" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_AddEbayConfig" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_EditEbayConfiguration"/> <DataResource dataResourceId="EBAY_ShippingMethods" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_ShippingMethods.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_ShippingMethods" contentTypeId="DOCUMENT" contentName="Ebay shippingMethods" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ShippingMethods" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ShippingMethods" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_EbayShippingMethods"/> <DataResource dataResourceId="EBAY_AdvanceSearch" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_AdvanceSearch.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_AdvanceSearch" contentTypeId="DOCUMENT" contentName="Ebay advance Search" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AdvanceSearch" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_AdvanceSearch" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_advancedsearch"/> <DataResource dataResourceId="EBAY_KeywordSearch" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_KeywordSearch.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_KeywordSearch.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_KeywordSearch" contentTypeId="DOCUMENT" contentName="Ebay keyword Search" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_KeywordSearch" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_KeywordSearch" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_keywordsearch"/> <DataResource dataResourceId="EBAY_ProdsExpToEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_ProductsExportToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_ProdsExpToEbay" contentTypeId="DOCUMENT" contentName="Ebay products export to Ebay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ProdsExpToEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_ProdsExpToEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ProductsExportToEbay"/> <DataResource dataResourceId="EBAY_MOrdsFromEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_ManageOrdersFromEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_MOrdsFromEbay" contentTypeId="DOCUMENT" contentName="Ebay import single transections from Ebay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_MOrdsFromEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_MOrdsFromEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_ManageOrdersFromEbay"/> <DataResource dataResourceId="EBAY_EbayOrders" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebay/data/helpdata/HELP_EBAY_eBayOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_EbayOrders" contentTypeId="DOCUMENT" contentName="Ebay orders import" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_EbayOrders" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_EbayOrders" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAY_FindEbayOrders"/> Modified: ofbiz/trunk/plugins/ebay/data/helpdata/HELP_EBAY_main.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ebay/data/helpdata/HELP_EBAY_main.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/ebay/data/helpdata/HELP_EBAY_main.xml (original) +++ ofbiz/trunk/plugins/ebay/data/helpdata/HELP_EBAY_main.xml Wed Jan 11 10:48:47 2017 @@ -47,7 +47,7 @@ </listitem> <listitem> <para> - Following file in specialpurpose/ebay/config/eBayExport.properties. You will see Merchant configurations. + Following file in plugins/ebay/config/eBayExport.properties. You will see Merchant configurations. For : eBayExport.xmlGatewayUri : <orderedlist> Modified: ofbiz/trunk/plugins/ebaystore/README URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ebaystore/README?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/ebaystore/README (original) +++ ofbiz/trunk/plugins/ebaystore/README Wed Jan 11 10:48:47 2017 @@ -28,6 +28,6 @@ ebaycalls.jar ebaysdkcore.jar helper.jar -3) enable the component by uncommenting out the ebaystore entry from specialpurpose/component-load.xml +3) enable the component by uncommenting out the ebaystore entry from plugins/component-load.xml 4) now you can build and run OFBiz as described in the main README file Modified: ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml (original) +++ ofbiz/trunk/plugins/ebaystore/data/EbayStoreHelpData.xml Wed Jan 11 10:48:47 2017 @@ -20,57 +20,57 @@ under the License. <entity-engine-xml> <!-- eBay store --> <DataResource dataResourceId="HELP_EBAY_STORE" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_EbayStore.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_EbayStore.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="eBay Store" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_EBAY_STORE" contentTypeId="DOCUMENT" contentName="eBay Store" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_EBAY_STORE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EBAY_STORE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_main"/> <DataResource dataResourceId="EBAY_NewEbayAccount" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_NewEbayAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_NewEbayAccount.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_NewEbayAccount" contentTypeId="DOCUMENT" contentName="EBay store new ebay Account" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_NewEbayAccount" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_NewEbayAccount" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_NewEbayAccount"/> <DataResource dataResourceId="EBAY_StoreSetting" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_StoreSetting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_StoreSetting.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_StoreSetting" contentTypeId="DOCUMENT" contentName="EBay store setting" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_StoreSetting" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_StoreSetting" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_ebayStoreDetail"/> <DataResource dataResourceId="EBAY_ExpCatToEbay" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_ExportCategoriesToEbay.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_ExpCatToEbay" contentTypeId="DOCUMENT" contentName="EBay export categories to store" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ExpCatToEbay" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_ExpCatToEbay" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_exportCategoryEbayStore"/> <!-- ebay feedback --> <DataResource dataResourceId="EBAY_LeaveFeedback" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_LeaveFeedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_LeaveFeedback" contentTypeId="DOCUMENT" contentName="EBay Leave Feedback" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_LeaveFeedback" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_LeaveFeedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_LeaveFeedback"/> <DataResource dataResourceId="EBAY_Feedback" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_Feedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_Feedback.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_Feedback" contentTypeId="DOCUMENT" contentName="EBay Feedback" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_Feedback" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY" contentIdTo="EBAY_Feedback" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_Feedback"/> <DataResource dataResourceId="EBAY_AutoPref" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_AutoPref.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_AutoPref.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_AutoPref" contentTypeId="DOCUMENT" contentName="EBay Automation Preferences" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_AutoPref" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_AutoPref" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_AutomationPreferences"/> <!-- block out of stock --> <DataResource dataResourceId="EBAY_BlockItem" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_BlockItemOutStock.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_BlockItemOutStock.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_BlockItem" contentTypeId="DOCUMENT" contentName="Block item that out of stock on eBay" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_BlockItem" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_BlockItem" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_blockItemOutOfStock"/> <!-- ebay product inventory --> <DataResource dataResourceId="EBAY_ProdInventory" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ProductInventory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_ProductInventory.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_ProdInventory" contentTypeId="DOCUMENT" contentName="handle ebay store inventory by ofbiz inventory" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_ProdInventory" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_ProdInventory" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_ebayStoreInventory"/> <DataResource dataResourceId="EBAY_reserveProd" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/ebaystore/data/helpdata/HELP_EBAY_ReserveProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/ebaystore/data/helpdata/HELP_EBAY_ReserveProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EBAY_reserveProd" contentTypeId="DOCUMENT" contentName="reserve product from ofbiz inventory" templateDataResourceId="HELP_TEMPL" dataResourceId="EBAY_reserveProd" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EBAY_STORE" contentIdTo="EBAY_reserveProd" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EBAYSTORE_reserveEbayProductInventory"/> </entity-engine-xml> Modified: ofbiz/trunk/plugins/example/config/ExampleUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/example/config/ExampleUiLabels.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/example/config/ExampleUiLabels.xml (original) +++ ofbiz/trunk/plugins/example/config/ExampleUiLabels.xml Wed Jan 11 10:48:47 2017 @@ -314,7 +314,7 @@ <value xml:lang="zh-TW">å¨æª:</value> </property> <property key="ExampleDefinitionFileTooltip"> - <value xml:lang="en">specialpurpose/example/widget/example/FormWidgetExampleForms.xml</value> + <value xml:lang="en">plugins/example/widget/example/FormWidgetExampleForms.xml</value> </property> <property key="ExampleDefinitionName"> <value xml:lang="en">See the form definition with name</value> Modified: ofbiz/trunk/plugins/example/data/ExampleHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/example/data/ExampleHelpData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/example/data/ExampleHelpData.xml (original) +++ ofbiz/trunk/plugins/example/data/ExampleHelpData.xml Wed Jan 11 10:48:47 2017 @@ -20,27 +20,27 @@ under the License. <entity-engine-xml> <DataResource dataResourceId="HELP_EXAMPLE" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Framework Example" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_EXAMPLE" contentTypeId="DOCUMENT" contentName="Framework Example" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_EXAMPLE" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_EXAMPLE" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000"/> <DataResource dataResourceId="HELP_EXAMPLE_FR" localeString="fr" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_FR.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Exemple pour le développement" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_EXAMPLE_FR" contentTypeId="DOCUMENT" contentName="Exemple pour le développement" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_EXAMPLE_FR" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html" localeString="fr" /> <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="HELP_EXAMPLE_FR" contentAssocTypeId="ALTERNATE_LOCALE" fromDate="2006-01-12 01:01:01"/> <DataResource dataResourceId="EXAMPLE_main" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example help main page" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_main.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example help main page" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EXAMPLE_main" contentTypeId="DOCUMENT" contentName="Example main menu." templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_main" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_main" fromDate="2006-01-12 01:01:01" contentAssocTypeId="TREE_CHILD" sequenceNum="000"/> <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_main" mapKey="EXAMPLE_FindExample" fromDate="2006-01-12 01:01:02" sequenceNum="000" contentAssocTypeId="INSTANCE"/> <DataResource dataResourceId="EXAMPLE_docbook" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/example/data/helpdata/HELP_EXAMPLE_docbook.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example docBook usage" mimeTypeId="text/xml" isPublic="Y" /> + objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_docbook.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example docBook usage" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="EXAMPLE_docbook" contentTypeId="DOCUMENT" contentName="Example Docbook usage" templateDataResourceId="HELP_TEMPL" dataResourceId="EXAMPLE_docbook" statusId="CTNT_IN_PROGRESS" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_EXAMPLE" contentIdTo="EXAMPLE_docbook" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum="000" mapKey="EXAMPLE_docbook"/> Modified: ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleScreens.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleScreens.xml (original) +++ ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleScreens.xml Wed Jan 11 10:48:47 2017 @@ -41,7 +41,7 @@ under the License. <container style="screenlet-body"> <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "DateTimeFieldsExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> - <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> <include-form name="DateTimeFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </container> </container> @@ -50,7 +50,7 @@ under the License. <container style="screenlet-body"> <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "DropDownFieldsExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> - <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> </container> <section> <actions> @@ -88,7 +88,7 @@ under the License. <container style="screenlet-body"> <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields" ${uiLabelMap.ExampleDefinitionFile}</label> - <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> <include-form name="ExampleLookupFields" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </container> </container> @@ -97,7 +97,7 @@ under the License. <container style="screenlet-body"> <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "FieldGroupExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> - <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> <container style="button-bar"> <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext expand-all" url-mode="plain"/> <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext collapse-all" url-mode="plain"/> @@ -110,7 +110,7 @@ under the License. <container style="screenlet-body"> <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "SelectionBoxesExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> - <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> <include-form name="SelectionBoxesExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </container> </container> @@ -119,7 +119,7 @@ under the License. <container style="screenlet-body"> <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "LinksExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> - <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/plugins/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> <include-form name="LinksExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </container> </container> Modified: ofbiz/trunk/plugins/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java (original) +++ ofbiz/trunk/plugins/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java Wed Jan 11 10:48:47 2017 @@ -43,7 +43,7 @@ import org.xml.sax.SAXException; */ public class LdapLoginWorker extends LoginWorker { - private static final String ldapConfig = "specialpurpose/ldap/config/ldap.xml"; + private static final String ldapConfig = "plugins/ldap/config/ldap.xml"; /** * An HTTP WebEvent handler that checks to see is a userLogin is logged in. Modified: ofbiz/trunk/plugins/lucene/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/lucene/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/lucene/README.md (original) +++ ofbiz/trunk/plugins/lucene/README.md Wed Jan 11 10:48:47 2017 @@ -17,4 +17,4 @@ https://issues.apache.org/jira/browse/OF ## commits Committed revisions can be viewed at -http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/lucene/ \ No newline at end of file +http://svn.apache.org/viewvc/ofbiz/trunk/plugins/lucene/ \ No newline at end of file Modified: ofbiz/trunk/plugins/myportal/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/myportal/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/myportal/README.md (original) +++ ofbiz/trunk/plugins/myportal/README.md Wed Jan 11 10:48:47 2017 @@ -15,4 +15,4 @@ https://issues.apache.org/jira/browse/OF ## commits Committed revisions can be viewed at -http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/ \ No newline at end of file +http://svn.apache.org/viewvc/ofbiz/trunk/plugins/myportal/ \ No newline at end of file Modified: ofbiz/trunk/plugins/myportal/data/MyPortalPageDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/myportal/data/MyPortalPageDemoData.xml?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/myportal/data/MyPortalPageDemoData.xml (original) +++ ofbiz/trunk/plugins/myportal/data/MyPortalPageDemoData.xml Wed Jan 11 10:48:47 2017 @@ -170,7 +170,7 @@ <!-- Myportal help pages --> <DataResource dataResourceId="HELP_MYPORTAL" localeString="en" dataResourceTypeId="OFBIZ_FILE" - objectInfo="specialpurpose/myportal/data/helpdata/HELP_MYPORTAL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" + objectInfo="plugins/myportal/data/helpdata/HELP_MYPORTAL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Calendar help file" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_MYPORTAL" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" dataResourceId="HELP_MYPORTAL" statusId="CTNT_IN_PROGRESS" contentName="My Portal" mimeTypeId="text/html"/> Modified: ofbiz/trunk/plugins/passport/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/passport/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/passport/README.md (original) +++ ofbiz/trunk/plugins/passport/README.md Wed Jan 11 10:48:47 2017 @@ -26,19 +26,19 @@ Authorization callback URL: https://Your You'll get your Client ID and Client Secret, write them down for later configuration. ------ OFBiz Side ------ -6. Edit specialpurpose/passport/data/OAuth2GitHubSeedData.xml, fill in the Client ID in clientId, Client Secret in clientSecret and the Authorization callback URL in returnUrl. +6. Edit plugins/passport/data/OAuth2GitHubSeedData.xml, fill in the Client ID in clientId, Client Secret in clientSecret and the Authorization callback URL in returnUrl. -7. Login to OFBiz webtools, in "XML Data Import" page, import specialpurpose/passport/data/OAuth2GitHubSeedData.xml. +7. Login to OFBiz webtools, in "XML Data Import" page, import plugins/passport/data/OAuth2GitHubSeedData.xml. -8. Edit specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml, uncomment +8. Edit plugins/ecommerce/webapp/ecomseo/WEB-INF/controller.xml, uncomment <include location="component://passport/webapp/passport/WEB-INF/controller-passport.xml"/> -9. Edit specialpurpose/ecommerce/widget/CommonScreens.xml, uncomment +9. Edit plugins/ecommerce/widget/CommonScreens.xml, uncomment <include-screen name="ListThirdPartyLogins" location="component://passport/widget/PassportScreens.xml"/> 10. Visit https://YourWebSiteOrInternetIp:8443/ecomseo/checkLogin, click GitHub icon in the "Third Party Login" area. You will be forwarded to GitHub OAuth2 login page. After logging in successfully, you will be logged in OFBiz. -11. The parameters in specialpurpose/passport/config/gitHubAuth.properties: +11. The parameters in plugins/passport/config/gitHubAuth.properties: github.env.prefix: test or live, default is test. This value will be store in envPrefix field of GitHubUser entity when a user logged in by GitHub OAuth2. github.authenticator.enabled: true or false, default is true. This parameter is for future extension. @@ -67,19 +67,19 @@ You'll get your Client ID and Client Sec 6. In "Application Settings" page, you can select Application Status to be Development or Live. ------ OFBiz Side ------ -7. Edit specialpurpose/passport/data/OAuth2LinkedInSeedData.xml, fill in the Client ID in apiKey, Client Secret in secretKey and the Authorization callback URL in testReturnUrl and/or liveReturnUrl. +7. Edit plugins/passport/data/OAuth2LinkedInSeedData.xml, fill in the Client ID in apiKey, Client Secret in secretKey and the Authorization callback URL in testReturnUrl and/or liveReturnUrl. -8. Login to OFBiz webtools, in "XML Data Import" page, import specialpurpose/passport/data/OAuth2LinkedInSeedData.xml. +8. Login to OFBiz webtools, in "XML Data Import" page, import plugins/passport/data/OAuth2LinkedInSeedData.xml. -9. Edit specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/controller.xml, uncomment +9. Edit plugins/ecommerce/webapp/ecomseo/WEB-INF/controller.xml, uncomment <include location="component://passport/webapp/passport/WEB-INF/controller-passport.xml"/> -10. Edit specialpurpose/ecommerce/widget/CommonScreens.xml, uncomment +10. Edit plugins/ecommerce/widget/CommonScreens.xml, uncomment <include-screen name="ListThirdPartyLogins" location="component://passport/widget/PassportScreens.xml"/> 11. Visit https://YourWebSiteOrInternetIp:8443/ecomseo/checkLogin, click LinkedIn icon in the "Third Party Login" area. You will be forwarded to LinkedIn OAuth2 login page. After logging in successfully, you will be logged in OFBiz. -12. The parameters in specialpurpose/passport/config/linkedInAuth.properties: +12. The parameters in plugins/passport/config/linkedInAuth.properties: linkedin.env.prefix: test or live, default is test. This value will be store in envPrefix field of LinkedInUser entity when a user logged in by LinkedIn OAuth2. If the value is test, you should set your Application Status to Development, and the "Authorized Redirect URLs" to the same as the testReturnUrl. If the value is live, you should set your Application Status to Live, and the "Authorized Redirect URLs" to the same as the liveReturnUrl. @@ -93,6 +93,6 @@ Q. I think my configures are right, why A. Please check whether the productStoreId in ThirdPartyLogin and OAuth2GitHub/OAuth2LinkedIn is the same as your web store. Q. How could I extend this component to support other OAuth2 providers? -A. 1st, you have to read the providers OAuth2 documents. 2nd, add some new entities. 3rd, add seed data. 4th, add the icon file under specialpurpose/passport/webapp/passport/images/. +A. 1st, you have to read the providers OAuth2 documents. 2nd, add some new entities. 3rd, add seed data. 4th, add the icon file under plugins/passport/webapp/passport/images/. 5th, add redirect and response request in controller-passport.xml. 6th, add java files to implement the redirect and response. Modified: ofbiz/trunk/plugins/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java (original) +++ ofbiz/trunk/plugins/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java Wed Jan 11 10:48:47 2017 @@ -40,7 +40,7 @@ public abstract class AbstractHtmlReport public final static String RUN_DROPTABLE_SCRIPT = "rundroptablescript"; - public final static String FILE_REPORT_OUTPUT = "specialpurpose/pricat/webapp/pricat/ftl/report.ftl"; + public final static String FILE_REPORT_OUTPUT = "plugins/pricat/webapp/pricat/ftl/report.ftl"; /** * Constructs a new report using the provided locale for the output language. Modified: ofbiz/trunk/plugins/projectmgr/README.md URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/projectmgr/README.md?rev=1778271&r1=1778270&r2=1778271&view=diff ============================================================================== --- ofbiz/trunk/plugins/projectmgr/README.md (original) +++ ofbiz/trunk/plugins/projectmgr/README.md Wed Jan 11 10:48:47 2017 @@ -11,4 +11,4 @@ which can be found at https://cwiki.apac JIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12312073 ## commits -Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/ \ No newline at end of file +Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/plugins/projectmgr/ \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |