diff --git a/assetmaint/README.md b/assetmaint/README.md
index 2b09e1720..fce561ec0 100644
--- a/assetmaint/README.md
+++ b/assetmaint/README.md
@@ -17,4 +17,4 @@ JIRA issues related to this component can be found at
## 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
diff --git a/assetmaint/entitydef/entitymodel.xml b/assetmaint/entitydef/entitymodel.xml
index 33d7e35f8..47dcffeea 100644
--- a/assetmaint/entitydef/entitymodel.xml
+++ b/assetmaint/entitydef/entitymodel.xml
@@ -28,7 +28,7 @@
None1.0
-
@@ -39,7 +39,7 @@
@@ -67,7 +67,7 @@
@@ -91,7 +91,7 @@
@@ -131,7 +131,7 @@
diff --git a/birt/README.md b/birt/README.md
index cfe12f0ba..1db09549a 100644
--- a/birt/README.md
+++ b/birt/README.md
@@ -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
diff --git a/birt/data/BirtHelpData.xml b/birt/data/BirtHelpData.xml
index 6e517f7fc..042ff1d4b 100644
--- a/birt/data/BirtHelpData.xml
+++ b/birt/data/BirtHelpData.xml
@@ -20,7 +20,7 @@
diff --git a/birt/documents/Birt.xml b/birt/documents/Birt.xml
index ff5e6765b..36bddbd41 100644
--- a/birt/documents/Birt.xml
+++ b/birt/documents/Birt.xml
@@ -24,6 +24,6 @@
BIRT report generator. An example report sales can be found in the example component.
-
+
diff --git a/birt/webapp/birt/WEB-INF/web.xml b/birt/webapp/birt/WEB-INF/web.xml
index cc3ca3acb..012b42328 100644
--- a/birt/webapp/birt/WEB-INF/web.xml
+++ b/birt/webapp/birt/WEB-INF/web.xml
@@ -113,7 +113,7 @@ under the License.
-->
BIRT_VIEWER_SCRIPTLIB_DIR
- ${ofbiz.home}/specialpurpose/birt/lib/scriptlib
+ ${ofbiz.home}/plugins/birt/lib/scriptlib
diff --git a/cmssite/data/CmsSiteDemoData.xml b/cmssite/data/CmsSiteDemoData.xml
index c2d879aec..80627c5e2 100644
--- a/cmssite/data/CmsSiteDemoData.xml
+++ b/cmssite/data/CmsSiteDemoData.xml
@@ -206,23 +206,23 @@ under the License.
-
-
+
+
-
+
-
+
-
+
diff --git a/ebay/data/EbayHelpData.xml b/ebay/data/EbayHelpData.xml
index 9594da083..32b738892 100644
--- a/ebay/data/EbayHelpData.xml
+++ b/ebay/data/EbayHelpData.xml
@@ -19,7 +19,7 @@ under the License.
-->
@@ -27,60 +27,60 @@ under the License.
+ objectInfo="plugins/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_Features.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" />
+ objectInfo="plugins/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_AddEbayConfiguration.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" />
+ objectInfo="plugins/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_KeywordSearch.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" />
+ objectInfo="plugins/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_eBayOrders.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Ebay" mimeTypeId="text/xml" isPublic="Y" />
diff --git a/ebay/data/helpdata/HELP_EBAY_main.xml b/ebay/data/helpdata/HELP_EBAY_main.xml
index 02ead3322..70ca646ea 100644
--- a/ebay/data/helpdata/HELP_EBAY_main.xml
+++ b/ebay/data/helpdata/HELP_EBAY_main.xml
@@ -47,7 +47,7 @@
- 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 :
diff --git a/ebaystore/README b/ebaystore/README
index a36eada16..e322dd792 100644
--- a/ebaystore/README
+++ b/ebaystore/README
@@ -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
diff --git a/ebaystore/data/EbayStoreHelpData.xml b/ebaystore/data/EbayStoreHelpData.xml
index b2336dc46..63438f19f 100644
--- a/ebaystore/data/EbayStoreHelpData.xml
+++ b/ebaystore/data/EbayStoreHelpData.xml
@@ -20,57 +20,57 @@ under the License.
+ objectInfo="plugins/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_StoreSetting.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" />
+ objectInfo="plugins/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_Feedback.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" />
+ objectInfo="plugins/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_ProductInventory.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" />
diff --git a/example/config/ExampleUiLabels.xml b/example/config/ExampleUiLabels.xml
index 2558df9c7..707e5a1ab 100644
--- a/example/config/ExampleUiLabels.xml
+++ b/example/config/ExampleUiLabels.xml
@@ -314,7 +314,7 @@
在檔:
- specialpurpose/example/widget/example/FormWidgetExampleForms.xml
+ plugins/example/widget/example/FormWidgetExampleForms.xmlSee the form definition with name
diff --git a/example/data/ExampleHelpData.xml b/example/data/ExampleHelpData.xml
index 2118b3bd2..c0d775c12 100644
--- a/example/data/ExampleHelpData.xml
+++ b/example/data/ExampleHelpData.xml
@@ -20,27 +20,27 @@ under the License.
+ 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" />
+ objectInfo="plugins/example/data/helpdata/HELP_EXAMPLE_docbook.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Example docBook usage" mimeTypeId="text/xml" isPublic="Y" />
diff --git a/example/widget/example/FormWidgetExampleScreens.xml b/example/widget/example/FormWidgetExampleScreens.xml
index a1a6f131a..ae57b5999 100644
--- a/example/widget/example/FormWidgetExampleScreens.xml
+++ b/example/widget/example/FormWidgetExampleScreens.xml
@@ -41,7 +41,7 @@ under the License.
-
+
@@ -50,7 +50,7 @@ under the License.
-
+
@@ -88,7 +88,7 @@ under the License.
-
+
@@ -97,7 +97,7 @@ under the License.
-
+
@@ -110,7 +110,7 @@ under the License.
-
+
@@ -119,7 +119,7 @@ under the License.
-
+
diff --git a/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java b/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java
index 8a218a8e6..59c817a83 100644
--- a/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java
+++ b/ldap/src/main/java/org/apache/ofbiz/ldap/LdapLoginWorker.java
@@ -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.
diff --git a/lucene/README.md b/lucene/README.md
index 1c8cb9600..1d55d0906 100644
--- a/lucene/README.md
+++ b/lucene/README.md
@@ -17,4 +17,4 @@ https://issues.apache.org/jira/browse/OFBIZ/component/12325315
## 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
diff --git a/myportal/README.md b/myportal/README.md
index adc4ec274..a12c91fc9 100644
--- a/myportal/README.md
+++ b/myportal/README.md
@@ -15,4 +15,4 @@ https://issues.apache.org/jira/browse/OFBIZ/component/12312425
## 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
diff --git a/myportal/data/MyPortalPageDemoData.xml b/myportal/data/MyPortalPageDemoData.xml
index 3dc2c6efe..8e097ae85 100644
--- a/myportal/data/MyPortalPageDemoData.xml
+++ b/myportal/data/MyPortalPageDemoData.xml
@@ -170,7 +170,7 @@
diff --git a/passport/README.md b/passport/README.md
index d2e82aad7..70ddaf513 100644
--- a/passport/README.md
+++ b/passport/README.md
@@ -26,19 +26,19 @@ Authorization callback URL: https://YourWebSiteOrInternetIp:8443/ecomseo/githubR
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
-9. Edit specialpurpose/ecommerce/widget/CommonScreens.xml, uncomment
+9. Edit plugins/ecommerce/widget/CommonScreens.xml, uncomment
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 Secret, write them down for later configura
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
-10. Edit specialpurpose/ecommerce/widget/CommonScreens.xml, uncomment
+10. Edit plugins/ecommerce/widget/CommonScreens.xml, uncomment
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 there's no third party login in my /ecom
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.
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
index fddd936b2..bf6004857 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java
@@ -40,7 +40,7 @@ public abstract class AbstractHtmlReport extends HtmlReport {
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.
diff --git a/projectmgr/README.md b/projectmgr/README.md
index 669a17546..86d47379b 100644
--- a/projectmgr/README.md
+++ b/projectmgr/README.md
@@ -11,4 +11,4 @@ which can be found at https://cwiki.apache.org/confluence/display/OFBIZ/Project+
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
diff --git a/projectmgr/data/ProjectMgrHelpData.xml b/projectmgr/data/ProjectMgrHelpData.xml
index 4d80b119b..ff8546900 100644
--- a/projectmgr/data/ProjectMgrHelpData.xml
+++ b/projectmgr/data/ProjectMgrHelpData.xml
@@ -20,28 +20,28 @@ under the License.
@@ -49,84 +49,84 @@ under the License.
@@ -134,14 +134,14 @@ under the License.
@@ -149,7 +149,7 @@ under the License.
@@ -157,7 +157,7 @@ under the License.
@@ -165,7 +165,7 @@ under the License.
diff --git a/projectmgr/entitydef/entitymodel.xml b/projectmgr/entitydef/entitymodel.xml
index 21f677cf9..edde1ddae 100644
--- a/projectmgr/entitydef/entitymodel.xml
+++ b/projectmgr/entitydef/entitymodel.xml
@@ -34,7 +34,7 @@ under the License.
@@ -56,7 +56,7 @@ under the License.
@@ -97,7 +97,7 @@ under the License.
@@ -122,7 +122,7 @@ under the License.
@@ -142,7 +142,7 @@ under the License.
@@ -182,7 +182,7 @@ under the License.
@@ -215,7 +215,7 @@ under the License.
@@ -257,7 +257,7 @@ under the License.
+ package-name="org.apache.ofbiz.plugins.project">
This view is used to deduct project's status from its children tasks status and
to deduct the status of a task depending on its assigned resources and time entries
@@ -288,7 +288,7 @@ under the License.
+ package-name="org.apache.ofbiz.plugins.project">
Retrieve actual, estimated start and end dates, priority, planned hours
@@ -325,7 +325,7 @@ under the License.
+ package-name="org.apache.ofbiz.plugins.project">
Retrieve actual, start and end dates from TimeEntries associated
@@ -351,7 +351,7 @@ under the License.
+ package-name="org.apache.ofbiz.plugins.project">
prepare actual hours total per project, phase or task,
this view is used by another view that do sums
@@ -399,7 +399,7 @@ under the License.
+ package-name="org.apache.ofbiz.plugins.project">
get total actual hour for which there is a valid partyRate that can be applicable
@@ -425,7 +425,7 @@ under the License.
+ package-name="org.apache.ofbiz.plugins.project">
get total actual hour for which there is NO valid partyRate applicable
@@ -442,7 +442,7 @@ under the License.
diff --git a/scrum/README.md b/scrum/README.md
index ac3ab064e..c6fa9bd16 100644
--- a/scrum/README.md
+++ b/scrum/README.md
@@ -11,4 +11,4 @@ which can be found at https://cwiki.apache.org/confluence/display/OFBIZ/Scrum+Ma
JIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12316900
## commits
-Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/
\ No newline at end of file
+Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/plugins/scrum/
\ No newline at end of file
diff --git a/scrum/data/scrumHelpData.xml b/scrum/data/scrumHelpData.xml
index fea895d09..f57bf2ad0 100644
--- a/scrum/data/scrumHelpData.xml
+++ b/scrum/data/scrumHelpData.xml
@@ -20,174 +20,174 @@
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_Project.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Project" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ProductView.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product" mimeTypeId="text/xml" isPublic="Y"/>
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_CreateScrumProject.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Project Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_AddProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Scrum Product Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_EditProdBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Sprint Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Sprint" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_AddSprintBacklog.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Add Sprint Backlog Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_AddSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Add Sprint Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_AddProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Create Scrum Product Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_SprintList.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint List Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ViewSprint.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint View Help" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_OpenTest.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Open Test" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_TaskView.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Task" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_FindResource.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Member" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_MyWork.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="MyWork" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_FindTimeSheet.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="TimeSheet" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ViewProduct.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Overview" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Default Tasks" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_defaultTasks.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Default Task" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="List Product Backlog Categories" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ListProductBacklogCategories.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Backlog Categories" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_EditProductContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Contents" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ProductEmails.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Communication Product Emails" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_NewProductEmail.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="New Emails" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_EditProjectContents.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Content" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_EditBacklogItemContent.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Edit Product Item Content" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Product Backlog Item" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ViewProdBacklogItem.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="View Product Backlog Item" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_ProductBacklogEmails.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Product Backlog Communications" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_SprintMember.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Sprint Member" mimeTypeId="text/xml" isPublic="Y" />
+ objectInfo="plugins/scrum/data/helpdata/HELP_SCRUM_DailyScrumMeetingMinute.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Daily Scrum Meeting Minute" mimeTypeId="text/xml" isPublic="Y" />
diff --git a/solr/README.md b/solr/README.md
index 977eaa7c7..427ab043b 100644
--- a/solr/README.md
+++ b/solr/README.md
@@ -15,4 +15,4 @@ More information about the Apache Solr product can be found at: http://lucene.ap
JIRA issues related to this component can be found at https://issues.apache.org/jira/browse/OFBIZ/component/12327633
## commits
-Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/solr/
\ No newline at end of file
+Committed revisions can be viewed at http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/
\ No newline at end of file
diff --git a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
index e69e023c0..de7c8c288 100644
--- a/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
+++ b/solr/src/main/java/org/apache/ofbiz/solr/webapp/OFBizSolrContextFilter.java
@@ -165,8 +165,8 @@ public class OFBizSolrContextFilter extends SolrDispatchFilter {
try {
nodeConfig = loadNodeConfig(solrHome, extraProperties);
} catch (SolrException e) {
-// nodeConfig = loadNodeConfig("specialpurpose/solr/home", extraProperties);
- Path path = Paths.get("specialpurpose/solr/home");
+// nodeConfig = loadNodeConfig("plugins/solr/home", extraProperties);
+ Path path = Paths.get("plugins/solr/home");
nodeConfig = loadNodeConfig(path, extraProperties);
}
cores = new CoreContainer(nodeConfig, extraProperties, true);
diff --git a/webpos/data/PosSyncSettings.xml b/webpos/data/PosSyncSettings.xml
index 3f31ab01d..930dab0af 100644
--- a/webpos/data/PosSyncSettings.xml
+++ b/webpos/data/PosSyncSettings.xml
@@ -43,7 +43,7 @@ under the License.
-
+
diff --git a/webpos/entitydef/entitymodel.xml b/webpos/entitydef/entitymodel.xml
index 7eaeabaa9..a7136daa0 100644
--- a/webpos/entitydef/entitymodel.xml
+++ b/webpos/entitydef/entitymodel.xml
@@ -30,15 +30,15 @@ under the License.
-
+
-
+
@@ -47,7 +47,7 @@ under the License.
@@ -74,7 +74,7 @@ under the License.
@@ -96,7 +96,7 @@ under the License.