Re: svn commit: r1806259 - in /ofbiz/ofbiz-framework/trunk/framework: common/config/general.properties entity/config/entityengine.xml webtools/template/Main.ftl

[Deepak Dixit-3]

Hi Rishi,

Need to revert build.gradle  changes as well.

Thanks & Regards
--
Deepak Dixit
www.hotwaxsystems.com
www.hotwax.co

On Sat, Aug 26, 2017 at 11:35 AM, <[hidden email]> wrote:

> Author: rishi
> Date: Sat Aug 26 06:05:15 2017
> New Revision: 1806259
>
> URL: http://svn.apache.org/viewvc?rev=1806259&view=rev
> Log:
> Reverted: Local changes mistakenly committed in revision 1806258
>
> Modified:
>     ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
>     ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
>     ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/
> general.properties
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/common/config/general.properties?rev=
> 1806259&r1=1806258&r2=1806259&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/common/config/general.properties
> Sat Aug 26 06:05:15 2017
> @@ -80,10 +80,10 @@ defaultFromEmailAddress=ofbiztest@exampl
>  # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
>
>  # -- mail notifications enabled (Y|N)
> -mail.notifications.enabled=Y
> +mail.notifications.enabled=N
>
>  # -- redirect all mail notifications to this address for testing
> -mail.notifications.redirectTo=[hidden email]
> +#mail.notifications.redirectTo=
>
>  # -- the default mail server to use
>  mail.smtp.relay.host=localhost
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/entity/config/
> entityengine.xml
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/entity/config/entityengine.xml?rev=1806259&
> r1=1806258&r2=1806259&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> Sat Aug 26 06:05:15 2017
> @@ -52,19 +52,19 @@ access. For a detailed description see t
>      <debug-xa-resources value="false" />  <!-- see
> https://issues.apache.org/jira/browse/OFBIZ-4282 for more -->
>
>      <delegator name="default" entity-model-reader="main"
> entity-group-reader="main" entity-eca-reader="main" distributed-cache-clear-
> enabled="false">
> -        <group-map group-name="org.apache.ofbiz" datasource-name="
> localpostgres"/>
> +        <group-map group-name="org.apache.ofbiz"
> datasource-name="localderby"/>
>          <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> localderbyolap"/>
>          <group-map group-name="org.apache.ofbiz.tenant" datasource-name="
> localderbytenant"/>
>      </delegator>
>      <delegator name="default-no-eca" entity-model-reader="main"
> entity-group-reader="main" entity-eca-reader="main"
> entity-eca-enabled="false" distributed-cache-clear-enabled="false">
> -        <group-map group-name="org.apache.ofbiz" datasource-name="
> localpostgres"/>
> +        <group-map group-name="org.apache.ofbiz"
> datasource-name="localderby"/>
>          <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> localderbyolap"/>
>          <group-map group-name="org.apache.ofbiz.tenant" datasource-name="
> localderbytenant"/>
>      </delegator>
>
>      <!-- be sure that your default delegator (or the one you use) uses
> the same datasource for test. You must run "gradlew loadAll" before running
> "gradlew testIntegration" -->
>      <delegator name="test" entity-model-reader="main"
> entity-group-reader="main" entity-eca-reader="main">
> -        <group-map group-name="org.apache.ofbiz" datasource-name="
> localpostgres"/>
> +        <group-map group-name="org.apache.ofbiz"
> datasource-name="localderby"/>
>          <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> localderbyolap"/>
>          <group-map group-name="org.apache.ofbiz.tenant" datasource-name="
> localderbytenant"/>
>      </delegator>
> @@ -483,9 +483,9 @@ access. For a detailed description see t
>          <read-data reader-name="ext-demo"/>
>          <inline-jdbc
>                  jdbc-driver="org.postgresql.Driver"
> -                jdbc-uri="jdbc:postgresql://127.0.0.1/plain_ofbiz_test"
> -                jdbc-username="rishi"
> -                jdbc-password="123456"
> +                jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
> +                jdbc-username="ofbiz"
> +                jdbc-password="ofbiz"
>                  isolation-level="ReadCommitted"
>                  pool-minsize="2"
>                  pool-maxsize="250"
>
> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
> URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> framework/webtools/template/Main.ftl?rev=1806259&r1=
> 1806258&r2=1806259&view=diff
> ============================================================
> ==================
> --- ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
> (original)
> +++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl Sat
> Aug 26 06:05:15 2017
> @@ -17,10 +17,6 @@ specific language governing permissions
>  under the License.
>  -->
>  <div class="screenlet">
> -<#assign test=Static["java.lang.String"].format("http://example.com/
> page?a=1&b=2") >
> -<p>result1=${test}</p>
> -<p>result2=${test?url('utf-8')}</p>
> -
>    <div class="screenlet-title-bar">
>      <ul>
>        <li class="h3">${uiLabelMap.WebtoolsMainPage}</li>
>
>
>

[Rishi Solanki]

Thanks Deepak done in -r1806260.

Rishi Solanki
Sr Manager, Enterprise Software Development
HotWax Systems Pvt. Ltd.
Direct: [phone]
http://www.hotwaxsystems.com
www.hotwax.co

On Sat, Aug 26, 2017 at 11:39 AM, Deepak Dixit <
[hidden email]> wrote:

> Hi Rishi,
>
> Need to revert build.gradle  changes as well.
>
> Thanks & Regards
> --
> Deepak Dixit
> www.hotwaxsystems.com
> www.hotwax.co
>
> On Sat, Aug 26, 2017 at 11:35 AM, <[hidden email]> wrote:
>
> > Author: rishi
> > Date: Sat Aug 26 06:05:15 2017
> > New Revision: 1806259
> >
> > URL: http://svn.apache.org/viewvc?rev=1806259&view=rev
> > Log:
> > Reverted: Local changes mistakenly committed in revision 1806258
> >
> > Modified:
> >     ofbiz/ofbiz-framework/trunk/framework/common/config/
> general.properties
> >     ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> >     ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
> >
> > Modified: ofbiz/ofbiz-framework/trunk/framework/common/config/
> > general.properties
> > URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> > framework/common/config/general.properties?rev=
> > 1806259&r1=1806258&r2=1806259&view=diff
> > ============================================================
> > ==================
> > --- ofbiz/ofbiz-framework/trunk/framework/common/config/
> general.properties
> > (original)
> > +++ ofbiz/ofbiz-framework/trunk/framework/common/config/
> general.properties
> > Sat Aug 26 06:05:15 2017
> > @@ -80,10 +80,10 @@ defaultFromEmailAddress=ofbiztest@exampl
> >  # as 'baseUrl' and 'baseSecureUrl' are set in the url.properties file.
> >
> >  # -- mail notifications enabled (Y|N)
> > -mail.notifications.enabled=Y
> > +mail.notifications.enabled=N
> >
> >  # -- redirect all mail notifications to this address for testing
> > -mail.notifications.redirectTo=[hidden email]
> > +#mail.notifications.redirectTo=
> >
> >  # -- the default mail server to use
> >  mail.smtp.relay.host=localhost
> >
> > Modified: ofbiz/ofbiz-framework/trunk/framework/entity/config/
> > entityengine.xml
> > URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> > framework/entity/config/entityengine.xml?rev=1806259&
> > r1=1806258&r2=1806259&view=diff
> > ============================================================
> > ==================
> > --- ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> > (original)
> > +++ ofbiz/ofbiz-framework/trunk/framework/entity/config/entityengine.xml
> > Sat Aug 26 06:05:15 2017
> > @@ -52,19 +52,19 @@ access. For a detailed description see t
> >      <debug-xa-resources value="false" />  <!-- see
> > https://issues.apache.org/jira/browse/OFBIZ-4282 for more -->
> >
> >      <delegator name="default" entity-model-reader="main"
> > entity-group-reader="main" entity-eca-reader="main"
> distributed-cache-clear-
> > enabled="false">
> > -        <group-map group-name="org.apache.ofbiz" datasource-name="
> > localpostgres"/>
> > +        <group-map group-name="org.apache.ofbiz"
> > datasource-name="localderby"/>
> >          <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> > localderbyolap"/>
> >          <group-map group-name="org.apache.ofbiz.tenant"
> datasource-name="
> > localderbytenant"/>
> >      </delegator>
> >      <delegator name="default-no-eca" entity-model-reader="main"
> > entity-group-reader="main" entity-eca-reader="main"
> > entity-eca-enabled="false" distributed-cache-clear-enabled="false">
> > -        <group-map group-name="org.apache.ofbiz" datasource-name="
> > localpostgres"/>
> > +        <group-map group-name="org.apache.ofbiz"
> > datasource-name="localderby"/>
> >          <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> > localderbyolap"/>
> >          <group-map group-name="org.apache.ofbiz.tenant"
> datasource-name="
> > localderbytenant"/>
> >      </delegator>
> >
> >      <!-- be sure that your default delegator (or the one you use) uses
> > the same datasource for test. You must run "gradlew loadAll" before
> running
> > "gradlew testIntegration" -->
> >      <delegator name="test" entity-model-reader="main"
> > entity-group-reader="main" entity-eca-reader="main">
> > -        <group-map group-name="org.apache.ofbiz" datasource-name="
> > localpostgres"/>
> > +        <group-map group-name="org.apache.ofbiz"
> > datasource-name="localderby"/>
> >          <group-map group-name="org.apache.ofbiz.olap" datasource-name="
> > localderbyolap"/>
> >          <group-map group-name="org.apache.ofbiz.tenant"
> datasource-name="
> > localderbytenant"/>
> >      </delegator>
> > @@ -483,9 +483,9 @@ access. For a detailed description see t
> >          <read-data reader-name="ext-demo"/>
> >          <inline-jdbc
> >                  jdbc-driver="org.postgresql.Driver"
> > -                jdbc-uri="jdbc:postgresql://127.0.0.1/plain_ofbiz_test"
> > -                jdbc-username="rishi"
> > -                jdbc-password="123456"
> > +                jdbc-uri="jdbc:postgresql://127.0.0.1/ofbiz"
> > +                jdbc-username="ofbiz"
> > +                jdbc-password="ofbiz"
> >                  isolation-level="ReadCommitted"
> >                  pool-minsize="2"
> >                  pool-maxsize="250"
> >
> > Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/template/
> Main.ftl
> > URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/
> > framework/webtools/template/Main.ftl?rev=1806259&r1=
> > 1806258&r2=1806259&view=diff
> > ============================================================
> > ==================
> > --- ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl
> > (original)
> > +++ ofbiz/ofbiz-framework/trunk/framework/webtools/template/Main.ftl Sat
> > Aug 26 06:05:15 2017
> > @@ -17,10 +17,6 @@ specific language governing permissions
> >  under the License.
> >  -->
> >  <div class="screenlet">
> > -<#assign test=Static["java.lang.String"].format("http://example.com/
> > page?a=1&b=2") >
> > -<p>result1=${test}</p>
> > -<p>result2=${test?url('utf-8')}</p>
> > -
> >    <div class="screenlet-title-bar">
> >      <ul>
> >        <li class="h3">${uiLabelMap.WebtoolsMainPage}</li>
> >
> >
> >
>