Author: jacopoc
Date: Wed Jul 16 07:28:32 2014
New Revision: 1610921
URL: http://svn.apache.org/r1610921
Log:
Applied fix from trunk for revision: 1610918
===
Fixed miscellaneous errors spotted while reviewing the logs generated by the
ArtifactInfo tool.
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/branches/release11.04/framework/common/webcommon/WEB-INF/portal-controller.xml
ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1610918
Modified:
ofbiz/branches/release11.04/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml?rev=1610921&r1=1610920&r2=1610921&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
(original)
+++
ofbiz/branches/release11.04/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml
Wed Jul 16 07:28:32 2014
@@ -25,7 +25,6 @@ under the License.
<if-empty field="parameters.fromDate">
<now-timestamp field="parameters.fromDate"/>
</if-empty>
- <set field="" from-field=""/>
<set field="searchDuplicatedAncestorContext.productId"
from-field="parameters.productId"/>
<set field="searchDuplicatedAncestorContext.productIdTo"
from-field="parameters.productIdTo"/>
Modified:
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=1610921&r1=1610920&r2=1610921&view=diff
==============================================================================
---
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
(original)
+++
ofbiz/branches/release11.04/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
Wed Jul 16 07:28:32 2014
@@ -139,7 +139,7 @@
<set-service-fields service-name="updatePartyRelationship"
map="partyRelationship" to-map="deletePartyRelationship"/>
<set from-field="nowTimestamp"
field="deletePartyRelationship.thruDate"/>
<call-service service-name="updatePartyRelationship"
in-map-name="deletePartyRelationship"/>
- <log level="info" message="Expiring relationship
${deletePartyRelationship}"> </log>
+ <log level="info" message="Expiring relationship
${deletePartyRelationship}"/>
<clear-field field="deletePartyRelationship"/>
<clear-field field="partyRelationship"/>
</if-not-empty>
Modified:
ofbiz/branches/release11.04/framework/common/webcommon/WEB-INF/portal-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1610921&r1=1610920&r2=1610921&view=diff
==============================================================================
---
ofbiz/branches/release11.04/framework/common/webcommon/WEB-INF/portal-controller.xml
(original)
+++
ofbiz/branches/release11.04/framework/common/webcommon/WEB-INF/portal-controller.xml
Wed Jul 16 07:28:32 2014
@@ -21,7 +21,10 @@ under the License.
<site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd";>
<description>Portal ControlServlet Configuration File</description>
-
+
+ <request-map uri="main">
+ <response name="success" type="view" value="showPortalPage"/>
+ </request-map>
<!-- Portlet show requests -->
<request-map uri="showPortlet">
<security https="true" auth="true"/>
Modified:
ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java?rev=1610921&r1=1610920&r2=1610921&view=diff
==============================================================================
---
ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
(original)
+++
ofbiz/branches/release11.04/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ServiceArtifactInfo.java
Wed Jul 16 07:28:32 2014
@@ -122,7 +122,7 @@ public class ServiceArtifactInfo extends
}
protected void populateEntitiesFromNameSet(Set<String> allEntityNameSet)
throws GeneralException {
for (String entityName: allEntityNameSet) {
- if (entityName.contains("${")) {
+ if (UtilValidate.isEmail(entityName) || entityName.contains("${"))
{
continue;
}
// attempt to convert relation names to entity names
