You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/06/07 20:48:18 UTC
svn commit: r1347754 - in /ofbiz/branches/20120329_portletWidget: ./
applications/content/ applications/content/lib/
applications/order/script/org/ofbiz/order/customer/
applications/party/webapp/partymgr/WEB-INF/actions/party/
applications/product/scri...
Author: erwan
Date: Thu Jun 7 18:48:16 2012
New Revision: 1347754
URL: http://svn.apache.org/viewvc?rev=1347754&view=rev
Log:
keeping updated the portletwidget branch
Added:
ofbiz/branches/20120329_portletWidget/applications/content/lib/tika-core-1.0.jar
- copied unchanged from r1347750, ofbiz/trunk/applications/content/lib/tika-core-1.0.jar
ofbiz/branches/20120329_portletWidget/applications/content/lib/tika-parsers-1.0.jar
- copied unchanged from r1347750, ofbiz/trunk/applications/content/lib/tika-parsers-1.0.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/slf4j-log4j12-1.6.4.jar
- copied unchanged from r1347750, ofbiz/trunk/framework/base/lib/slf4j-log4j12-1.6.4.jar
Removed:
ofbiz/branches/20120329_portletWidget/framework/base/lib/jcl-over-slf4j-1.6.4.jar
ofbiz/branches/20120329_portletWidget/framework/base/lib/slf4j-simple-1.6.4.jar
ofbiz/branches/20120329_portletWidget/framework/jcr/
ofbiz/branches/20120329_portletWidget/specialpurpose/example/src/org/ofbiz/example/JackrabbitEvents.java
ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/jackrabbit/
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleJackrabbitForms.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleJackrabbitScreens.xml
Modified:
ofbiz/branches/20120329_portletWidget/ (props changed)
ofbiz/branches/20120329_portletWidget/.classpath
ofbiz/branches/20120329_portletWidget/.gitignore
ofbiz/branches/20120329_portletWidget/applications/content/build.xml
ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed)
ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed)
ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed)
ofbiz/branches/20120329_portletWidget/build.xml
ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml
ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml
ofbiz/branches/20120329_portletWidget/framework/build.xml
ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java
ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml (props changed)
ofbiz/branches/20120329_portletWidget/framework/component-load.xml
ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml
ofbiz/branches/20120329_portletWidget/framework/entity/ofbiz-component.xml
ofbiz/branches/20120329_portletWidget/framework/security/data/PasswordSecurityData.xml (props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/ (props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/build.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed)
ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed)
ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat (props changed)
ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh (props changed)
Propchange: ofbiz/branches/20120329_portletWidget/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1346324-1347750
Modified: ofbiz/branches/20120329_portletWidget/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.classpath?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/.classpath (original)
+++ ofbiz/branches/20120329_portletWidget/.classpath Thu Jun 7 18:48:16 2012
@@ -11,6 +11,8 @@
<classpathentry kind="lib" path="applications/content/lib/poi-ooxml-3.8-20120326.jar"/>
<classpathentry kind="lib" path="applications/content/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
<classpathentry kind="lib" path="applications/content/lib/poi-scratchpad-3.8-20120326.jar"/>
+ <classpathentry kind="lib" path="applications/content/lib/tika-core-1.0.jar"/>
+ <classpathentry kind="lib" path="applications/content/lib/tika-parsers-1.0.jar"/>
<classpathentry kind="lib" path="applications/product/lib/watermarker-0.0.4.jar"/>
<classpathentry kind="lib" path="applications/product/lib/dozer-4.2.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/ant-1.8.3.jar"/>
@@ -127,15 +129,6 @@
<classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-transaction-2.1.1.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/concurrent-1.3.4.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-api-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-core-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jca-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-jcr-commons-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-spi-commons-2.3.3.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jackrabbit-ocm-2.0.jar" sourcepath="/ocm"/>
- <classpathentry kind="lib" path="framework/jcr/lib/jcr-2.0.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/javax.servlet.jsp.jstl-1.2.0.v201105211821.jar"/>
<classpathentry kind="lib" path="framework/jetty/lib/jetty-ajp-8.1.2.v20120308.jar"/>
@@ -204,7 +197,6 @@
<classpathentry excluding="org/ofbiz/entity/connection/XaPoolConnectionFactory.java" kind="src" path="framework/entity/src"/>
<classpathentry kind="src" path="framework/entityext/src"/>
<classpathentry kind="src" path="framework/geronimo/src"/>
- <classpathentry kind="src" path="framework/jcr/src"/>
<classpathentry kind="src" path="framework/jetty/src"/>
<classpathentry kind="src" path="framework/minilang/src"/>
<classpathentry kind="src" path="framework/security/src"/>
@@ -232,7 +224,5 @@
<classpathentry kind="src" path="specialpurpose/webpos/src"/>
<classpathentry kind="src" path="specialpurpose/workflow/src"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
- <classpathentry kind="lib" path="framework/jcr/lib/tika-core-1.0.jar"/>
- <classpathentry kind="lib" path="framework/jcr/lib/tika-parsers-1.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ofbiz/branches/20120329_portletWidget/.gitignore
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/.gitignore?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/.gitignore (original)
+++ ofbiz/branches/20120329_portletWidget/.gitignore Thu Jun 7 18:48:16 2012
@@ -19,8 +19,6 @@ runtime/logs/*.log*
runtime/logs/*.html*
runtime/logs/test-results/*
runtime/data/derby/*
-runtime/data/jcr/*
-runtime/data/jcr-test/*
runtime/data/utilcache.*
runtime/catalina/work/*
runtime/jetty
Modified: ofbiz/branches/20120329_portletWidget/applications/content/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/build.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/content/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/content/build.xml Thu Jun 7 18:48:16 2012
@@ -47,7 +47,6 @@ under the License.
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
- <fileset dir="../../framework/jcr/lib" includes="*.jar"/>
</path>
<patternset id="src.exc.set">
Propchange: ofbiz/branches/20120329_portletWidget/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:r1346324-1347750
Modified: ofbiz/branches/20120329_portletWidget/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/build.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/build.xml Thu Jun 7 18:48:16 2012
@@ -1027,7 +1027,7 @@ under the License.
<property name="sonar.sources" value="framework/appserver/src, framework/base/src, framework/bi/src, framework/birt/src,
framework/catalina/src, framework/common/src, framework/datafile/src, framework/entity/src, framework/entityext/src,
- framework/example/src, framework/geronimo/src, framework/jetty/src, framework/jcr/src,
+ framework/example/src, framework/geronimo/src, framework/jetty/src,
framework/minilang/src, framework/security/src, framework/service/src, framework/sql/src, framework/start/src,
framework/testtools/src, framework/webapp/src, framework/webtools/src, framework/widget/src,
applications/accounting/src, applications/commonext/src, applications/content/src, applications/humanres/src,
@@ -1037,7 +1037,7 @@ under the License.
specialpurpose/googlecheckout/src, specialpurpose/hhfacility/src, specialpurpose/oagis/src, specialpurpose/pos/src,
specialpurpose/scrum/src" />
<property name="sonar.tests" value="framework/base/src/org/ofbiz/base/test, framework/entity/src/org/ofbiz/entity/test,
- framework/jcr/src/org/ofbiz/jcr/test, framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test,
+ framework/service/src/org/ofbiz/service/test, framework/sql/src/org/ofbiz/sql/test,
applications/accounting/src/org/ofbiz/accounting/test, applications/content/src/org/ofbiz/content/test,
applications/product/src/org/ofbiz/product/test, applications/product/src/org/ofbiz/shipment/test,
applications/securityext/src/org/ofbiz/securityext/test" />
Modified: ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/config/ofbiz-containers.xml Thu Jun 7 18:48:16 2012
@@ -74,26 +74,6 @@ under the License.
</container>
-->
- <!-- load Shark Workflow Engine -->
- <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file.
- <container name="shark-container" class="org.ofbiz.shark.container.SharkContainer">
- <property name="engine-name" value="Shark"/>
- <property name="delegator-name" value="default"/>
- <property name="dispatcher-name" value="WFDispatcher"/>
- <property name="admin-user" value="system"/>
- <property name="admin-pass" value="ofbiz"/>
- <property name="iiop-host" value="127.0.0.1"/>
- <property name="iiop-port" value="2000"/>
- </container>
- -->
-
- <!-- Load embedded Jackrabbit content repository. Since this container depends
- upon JNDI, it must be started after the naming-container container.-->
- <container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer">
- <property name="configFilePath" value="framework/jcr/config/jcr-config.xml"/>
- <property name="removeOnShutdown" value="false"/>
- </container>
-
<!-- load catalina (tomcat) and all web applications -->
<container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer">
<!-- static configuration for tomcat -->
Modified: ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/base/config/test-containers.xml Thu Jun 7 18:48:16 2012
@@ -50,26 +50,6 @@ under the License.
<property name="ssl-client-auth" value="true"/>
</container>
- <!-- load Shark Workflow Engine -->
- <!-- NOTE: before uncommenting this please see the instructions in the ofbiz/OPTIONAL_LIBRARIES file.
- <container name="shark-container" class="org.ofbiz.shark.container.SharkContainer">
- <property name="engine-name" value="Shark"/>
- <property name="delegator-name" value="test"/>
- <property name="dispatcher-name" value="WFDispatcher"/>
- <property name="admin-user" value="system"/>
- <property name="admin-pass" value="ofbiz"/>
- <property name="iiop-host" value="127.0.0.1"/>
- <property name="iiop-port" value="2001"/>
- </container>
- -->
-
- <!-- Load embedded Jackrabbit content repository. Since this container depends
- upon JNDI, it must be started after the naming-container container.-->
- <container name="jcr-container" class="org.ofbiz.jcr.loader.JCRContainer">
- <property name="configFilePath" value="framework/jcr/config/jcr-test-config.xml"/>
- <property name="removeRepositoryOnShutdown" value="true"/>
- </container>
-
<!-- load catalina (tomcat) and all web applications -->
<container name="catalina-container" class="org.ofbiz.catalina.container.CatalinaContainer">
<!-- static configuration for tomcat -->
Modified: ofbiz/branches/20120329_portletWidget/framework/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/build.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/build.xml Thu Jun 7 18:48:16 2012
@@ -25,7 +25,7 @@ under the License.
files="start/build.xml,base/build.xml,sql/build.xml,
entity/build.xml,geronimo/build.xml,
catalina/build.xml,jetty/build.xml,
- security/build.xml,service/build.xml,jcr/build.xml,entityext/build.xml,
+ security/build.xml,service/build.xml,entityext/build.xml,
bi/build.xml,minilang/build.xml,
webapp/build.xml,widget/build.xml,
common/build.xml,datafile/build.xml,birt/build.xml,
Modified: ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java (original)
+++ ofbiz/branches/20120329_portletWidget/framework/common/src/org/ofbiz/common/preferences/PreferenceServices.java Thu Jun 7 18:48:16 2012
@@ -80,7 +80,7 @@ public class PreferenceServices {
Map<String, Object> userPrefMap = null;
try {
- GenericValue preference = EntityUtil.getFirst(delegator.findByAnd("UserPreference", fieldMap, null, false));
+ GenericValue preference = EntityUtil.getFirst(delegator.findByAnd("UserPreference", fieldMap, null, true));
if (preference != null) {
userPrefMap = PreferenceWorker.createUserPrefMap(preference);
}
@@ -124,14 +124,16 @@ public class PreferenceServices {
if (UtilValidate.isEmpty(userPrefGroupTypeId)) {
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "getPreference.invalidArgument", locale));
}
- String userLoginId = PreferenceWorker.getUserLoginId(context, true);
+ String userLoginId = PreferenceWorker.getUserLoginId(context, false);
Map<String, Object> userPrefMap = null;
try {
Map<String, String> fieldMap = UtilMisc.toMap("userLoginId", "_NA_", "userPrefGroupTypeId", userPrefGroupTypeId);
- userPrefMap = PreferenceWorker.createUserPrefMap(delegator.findByAnd("UserPreference", fieldMap, null, false));
- fieldMap.put("userLoginId", userLoginId);
- userPrefMap.putAll(PreferenceWorker.createUserPrefMap(delegator.findByAnd("UserPreference", fieldMap, null, false)));
+ userPrefMap = PreferenceWorker.createUserPrefMap(delegator.findByAnd("UserPreference", fieldMap, null, true));
+ if (userLoginId != null) {
+ fieldMap.put("userLoginId", userLoginId);
+ userPrefMap.putAll(PreferenceWorker.createUserPrefMap(delegator.findByAnd("UserPreference", fieldMap, null, true)));
+ }
} catch (GenericEntityException e) {
Debug.logWarning(e.getMessage(), module);
return ServiceUtil.returnError(UtilProperties.getMessage(resource, "getPreference.readFailure", new Object[] { e.getMessage() }, locale));
Propchange: ofbiz/branches/20120329_portletWidget/framework/common/widget/HelpScreens.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/framework/common/widget/HelpScreens.xml:r1346324-1347750
Modified: ofbiz/branches/20120329_portletWidget/framework/component-load.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/component-load.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/component-load.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/component-load.xml Thu Jun 7 18:48:16 2012
@@ -32,7 +32,6 @@ under the License.
<load-component component-location="common"/>
<load-component component-location="service"/>
<load-component component-location="entityext"/>
- <load-component component-location="jcr"/>
<load-component component-location="bi"/>
<load-component component-location="birt"/>
<load-component component-location="webapp"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entity/config/entityengine.xml Thu Jun 7 18:48:16 2012
@@ -98,6 +98,7 @@ access. For a detailed description see t
<!-- need to at least define a name for each component to use -->
<!-- defining:
+ security = OFBiz security group and security permissions. are required to show a component.
tenant = OFBiz and External Tenant Data
seed = OFBiz and External Seed Data - to be maintained along with source and updated whenever a system deployment is updated
seed-initial = OFBiz and External Seed Data - to be maintained along with source like other seed data, but only loaded initially and not updated when a system is updated except manually reviewing each line
@@ -106,6 +107,7 @@ access. For a detailed description see t
ext-test = External Test Data (custom)
ext-demo = External Demo Data (custom)
-->
+ <entity-data-reader name="security"/>
<entity-data-reader name="tenant"/>
<entity-data-reader name="seed"/>
<entity-data-reader name="seed-initial"/>
@@ -153,6 +155,7 @@ access. For a detailed description see t
use-fk-initially-deferred="false"
join-style="ansi-no-parenthesis"
alias-view-columns="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -182,6 +185,7 @@ access. For a detailed description see t
use-indices-unique="false"
alias-view-columns="false"
use-order-by-nulls="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -232,6 +236,7 @@ access. For a detailed description see t
alias-view-columns="false"
use-order-by-nulls="true">
<!-- beware use-indices-unique="false" is needed because of Derby bug with null values in a unique index -->
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -258,6 +263,7 @@ access. For a detailed description see t
use-indices-unique="false"
alias-view-columns="false"
use-order-by-nulls="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -281,6 +287,7 @@ access. For a detailed description see t
field-type-name="daffodil"
check-on-start="true"
add-missing-on-start="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -306,6 +313,7 @@ access. For a detailed description see t
check-on-start="true"
add-missing-on-start="true"
use-pk-constraint-names="false">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -335,6 +343,7 @@ access. For a detailed description see t
table-type="InnoDB"
character-set="latin1"
collate="latin1_general_cs">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -366,6 +375,7 @@ access. For a detailed description see t
table-type="InnoDB"
character-set="latin1"
collate="latin1_general_cs">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -397,6 +407,7 @@ access. For a detailed description see t
table-type="InnoDB"
character-set="latin1"
collate="latin1_general_cs">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -428,6 +439,7 @@ access. For a detailed description see t
table-type="InnoDB"
character-set="latin1"
collate="latin1_general_cs">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<inline-jdbc
@@ -456,6 +468,7 @@ access. For a detailed description see t
<!-- use this attribute to make the EntityListIterator more effective for pgjdbc 7.5devel and later:
result-fetch-size="50"
-->
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -494,6 +507,7 @@ access. For a detailed description see t
result-fetch-size="50"
use-binary-type-for-blob="true"
use-order-by-nulls="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -528,6 +542,7 @@ access. For a detailed description see t
result-fetch-size="50"
use-binary-type-for-blob="true"
use-order-by-nulls="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -562,6 +577,7 @@ access. For a detailed description see t
result-fetch-size="50"
use-binary-type-for-blob="true"
use-order-by-nulls="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -594,6 +610,7 @@ access. For a detailed description see t
alias-view-columns="false"
join-style="ansi"
use-order-by-nulls="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -635,6 +652,7 @@ access. For a detailed description see t
add-missing-on-start="true"
use-fk-initially-deferred="false"
join-style="ansi">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -659,6 +677,7 @@ access. For a detailed description see t
fk-style="name_fk"
use-fk-initially-deferred="false"
join-style="ansi-no-parenthesis">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -687,6 +706,7 @@ access. For a detailed description see t
add-missing-on-start="true"
alias-view-columns="false"
join-style="ansi">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -730,6 +750,7 @@ access. For a detailed description see t
join-style="ansi"
alias-view-columns="false"
use-fk-initially-deferred="false">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -754,6 +775,7 @@ access. For a detailed description see t
check-on-start="true"
add-missing-on-start="true"
join-style="ansi">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
@@ -782,6 +804,7 @@ access. For a detailed description see t
join-style="ansi-no-parenthesis"
alias-view-columns="false"
always-use-constraint-keyword="true">
+ <read-data reader-name="security"/>
<read-data reader-name="tenant"/>
<read-data reader-name="seed"/>
<read-data reader-name="seed-initial"/>
Modified: ofbiz/branches/20120329_portletWidget/framework/entity/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/entity/ofbiz-component.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/framework/entity/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/framework/entity/ofbiz-component.xml Thu Jun 7 18:48:16 2012
@@ -34,7 +34,7 @@ under the License.
<!-- these are for unit testing -->
<entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel_test.xml"/>
- <entity-resource type="data" reader-name="tenant" loader="main" location="data/TenantDemoData.xml"/>
+ <entity-resource type="data" reader-name="demo" loader="main" location="data/TenantDemoData.xml"/>
<test-suite loader="main" location="testdef/entitytests.xml"/>
</ofbiz-component>
Propchange: ofbiz/branches/20120329_portletWidget/framework/security/data/PasswordSecurityData.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/ebaystore/lib/
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/ebaystore/lib:r1346324-1347750
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Thu Jun 7 18:48:16 2012
@@ -100,11 +100,6 @@ under the License.
<url-pattern>/*</url-pattern>
</filter-mapping>
- <error-page>
- <error-code>404</error-code>
- <location>/error/404.jsp</location>
- </error-page>
-
<listener><listener-class>org.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
<!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface -->
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
@@ -162,4 +157,9 @@ under the License.
<welcome-file>index.html</welcome-file>
<welcome-file>index.htm</welcome-file>
</welcome-file-list>
+
+ <error-page>
+ <error-code>404</error-code>
+ <location>/error/404.jsp</location>
+ </error-page>
</web-app>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/build.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/build.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/build.xml Thu Jun 7 18:48:16 2012
@@ -51,7 +51,5 @@ under the License.
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
- <fileset dir="../../framework/jcr/lib" includes="*.jar"/>
- <fileset dir="../../framework/jcr/build/lib" includes="*.jar"/>
</path>
</project>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml Thu Jun 7 18:48:16 2012
@@ -19,7 +19,6 @@
under the License.
-->
<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
<!-- #Bam# Begin Addon modification portletExample -->
<property key="ExampleApplicationPortal">
<value xml:lang="en">Portal Example Application</value>
@@ -590,42 +589,6 @@
<value xml:lang="it">Gruppi campi</value>
<value xml:lang="zh">æ°æ®é¡¹ç»</value>
</property>
- <property key="ExampleJackrabbitCleanRepository">
- <value xml:lang="de">Repository aufräumen</value>
- <value xml:lang="en">Clean repository</value>
- </property>
- <property key="ExampleJackrabbitCleanRepositoryTooltip">
- <value xml:lang="de">Löscht alle Nodes aus dem Repository, die keine Verkünpfung in der Content Tabelle haben.</value>
- <value xml:lang="en">Removes all nodes which are not linked in the content table.</value>
- </property>
- <property key="ExampleJackrabbitListNodes">
- <value xml:lang="de">Liste alles Knoten</value>
- <value xml:lang="en">List Nodes</value>
- </property>
- <property key="ExampleJackrabbitQueryForContent">
- <value xml:lang="de">Das Repository kann mit Hilfe der SQL2 oder JQOM Query Language durchsucht werden: z.B. SELECT * FROM [nt:unstructured] gibt alle nodes vom Typ nt:unstructured zurück.</value>
- <value xml:lang="en">You can search the repository by using SQL2 or JQOM query syntax: i.e. SELECT * FROM [nt:unstructured] gives all nodes with the typ nt:unstructured.</value>
- </property>
- <property key="ExampleJackrabbitQuickContentSelect">
- <value xml:lang="de">Content Schnellauswahl - Content Node auswählen und Sprache bestimmen.</value>
- <value xml:lang="en">Content quick select - Choose your content node and select a language.</value>
- </property>
- <property key="ExampleJackrabbitShowContentData">
- <value xml:lang="de">(Text) Content anzeigen</value>
- <value xml:lang="en">Show (text) content</value>
- </property>
- <property key="ExampleJackrabbitShowUploadedFiles">
- <value xml:lang="de">Dateien anzeigen</value>
- <value xml:lang="en">Show uploaded Files</value>
- </property>
- <property key="ExampleJackrabbitTryRightClick">
- <value xml:lang="de">Wähle eine Datei und versuche einen Rechtklick</value>
- <value xml:lang="en">Choose a file and try a 'right click'</value>
- </property>
- <property key="ExampleJackrabbitUploadFileData">
- <value xml:lang="de">Eine neue Datei speichern</value>
- <value xml:lang="en">Upload a new file</value>
- </property>
<property key="ExampleLanguageTextVersion">
<value xml:lang="de">Verion der gewählten sprache</value>
<value xml:lang="en">Version of the choosen language</value>
@@ -911,10 +874,6 @@
<value xml:lang="th">à¹à¸à¹à¹à¸à¸ªà¸´à¸à¸à¹à¸²à¸à¸±à¸§à¸à¸¢à¹à¸²à¸</value>
<value xml:lang="zh">ç¼è¾æ ·ä¾æç»</value>
</property>
- <property key="PageTitleExampleJackrabbit">
- <value xml:lang="de">Jackrabbit</value>
- <value xml:lang="en">Jackrabbit</value>
- </property>
<!-- Page Titles -->
<property key="PageTitleFindExample">
<value xml:lang="en">Find Example</value>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/webapp/example/WEB-INF/controller.xml Thu Jun 7 18:48:16 2012
@@ -238,95 +238,6 @@ under the License.
</request-map>
<!-- end of request mappings -->
- <!-- Jackrabbit Example Requests -->
- <request-map uri="ExampleJackrabbit">
- <security auth="true" https="true" />
- <response name="success" type="view" value="ExampleJackrabbit" />
- <response name="error" type="view" value="ExampleJackrabbit" />
- </request-map>
- <request-map uri="ExampleJackrabbitAddData">
- <security auth="true" https="true" />
- <response name="success" type="view" value="ExampleJackrabbitAddData" />
- <response name="error" type="view" value="ExampleJackrabbitAddData" />
- </request-map>
- <request-map uri="StoreNewRepositoryData">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="addNewTextMessageToJcrRepository" />
- <response name="success" type="request" value="ExampleJackrabbitShowContentData" />
- <response name="error" type="view" value="ExampleJackrabbitAddData" />
- </request-map>
- <request-map uri="ExampleJackrabbitScanRepositoryStructure">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="scanRepositoryStructure"/>
- <response name="success" type="view" value="ExampleJackrabbitScanRepositoryStructure" />
- <response name="error" type="view" value="ExampleJackrabbitScanRepositoryStructure" />
- </request-map>
- <request-map uri="EditRepositoryContent">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getNodeContent"/>
- <response name="success" type="view" value="ExampleJackrabbitEditRepositoryContent" />
- <response name="error" type="request" value="ExampleJackrabbitShowContentData" />
- </request-map>
- <request-map uri="UpdateRepositoryData">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="updateRepositoryData"/>
- <response name="success" type="request" value="EditRepositoryContent" />
- <response name="error" type="request" value="EditRepositoryContent" />
- </request-map>
- <request-map uri="RemoveRepositoryNode">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="removeRepositoryNode"/>
- <response name="success" type="request" value="ExampleJackrabbitShowContentData" />
- <response name="error" type="request" value="ExampleJackrabbitShowContentData" />
- </request-map>
- <request-map uri="RemoveRepositoryFile">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="removeRepositoryNode"/>
- <response name="success" type="request" value="ExampleJackrabbitShowUploadedFiles" />
- <response name="error" type="request" value="ExampleJackrabbitShowUploadedFiles" />
- </request-map>
- <request-map uri="ExampleJackrabbitUploadFileData">
- <security auth="true" https="true" />
- <response name="success" type="view" value="ExampleJackrabbitUploadFileData" />
- <response name="error" type="view" value="ExampleJackrabbitUploadFileData" />
- </request-map>
- <request-map uri="StoreNewRepositoryFileData">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="uploadFileData"/>
- <response name="success" type="request" value="ExampleJackrabbitShowUploadedFiles" />
- <response name="error" type="view" value="ExampleJackrabbitUploadFileData" />
- </request-map>
- <request-map uri="ExampleJackrabbitShowUploadedFiles">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getRepositoryFileTree"/>
- <response name="success" type="view" value="ExampleJackrabbitShowUploadedFiles" />
- <response name="error" type="view" value="ExampleJackrabbitShowUploadedFiles" />
- </request-map>
- <request-map uri="GetFileFromRepository">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getFileFromRepository"/>
- <response name="success" type="none" />
- <response name="error" type="none" />
- </request-map>
- <request-map uri="ExampleJackrabbitShowContentData">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getRepositoryDataTree"/>
- <response name="success" type="view" value="ExampleJackrabbitShowContentData"/>
- <response name="error" type="view" value="ExampleJackrabbitShowContentData"/>
- </request-map>
- <request-map uri="OpenFileInformation">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="getFileInformation"/>
- <response name="success" type="view" value="ExampleJackrabbitOpenFileInformation"/>
- <response name="error" type="view" value="ExampleJackrabbitShowUploadedFiles"/>
- </request-map>
- <request-map uri="QueryRepositoryData">
- <security auth="true" https="true" />
- <event type="java" path="org.ofbiz.example.JackrabbitEvents" invoke="queryRepositoryData"/>
- <response name="success" type="view" value="ExampleJackrabbitShowQueryResult"/>
- <response name="error" type="request" value="ExampleJackrabbitShowContentData"/>
- </request-map>
-
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://example/widget/example/CommonScreens.xml#main"/>
@@ -372,18 +283,6 @@ under the License.
<view-map name="ExampleBarChart" page="component://example/widget/example/ExampleScreens.xml#ExampleBarChart" type="screen"/>
<view-map name="ExamplePieChart" page="component://example/widget/example/ExampleScreens.xml#ExamplePieChart" type="screen"/>
- <!-- Jackrabbit View Mapping -->
- <view-map name="ExampleJackrabbit" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ListRepositoryData" type="screen" />
- <view-map name="ExampleJackrabbitAddData" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitAddData" type="screen" />
- <view-map name="ExampleJackrabbitScanRepositoryStructure" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitScanRepositoryStructure" type="screen" />
- <view-map name="ExampleJackrabbitEditRepositoryContent" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitEditRepositoryContent" type="screen" />
- <view-map name="ExampleJackrabbitUploadFileData" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitUploadFileData" type="screen" />
- <view-map name="ExampleJackrabbitShowUploadedFiles" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowUploadedFiles" type="screen" />
- <view-map name="ExampleJackrabbitShowContentData" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowContentData" type="screen" />
- <view-map name="ExampleJackrabbitOpenFileInformation" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowFileInformation" type="screen" />
- <view-map name="ExampleJackrabbitShowQueryResult" page="component://example/widget/example/ExampleJackrabbitScreens.xml#ExampleJackrabbitShowQueryResult" type="screen" />
-
-
<!-- Supported Content Types -->
<!--
text/html
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/CommonScreens.xml Thu Jun 7 18:48:16 2012
@@ -315,32 +315,6 @@ under the License.
</section>
</screen>
- <screen name="CommonExampleJackrabbitDecorator">
- <section>
- <actions>
- <set field="headerItem" value="ExampleJackrabbit" />
- <set field="labelFieldName" value="exampleTypeId" />
- <set field="dataFieldName" value="total" />
- </actions>
- <widgets>
- <decorator-screen name="main-decorator"
- location="${parameters.mainDecoratorLocation}">
- <decorator-section name="pre-body">
- <include-menu name="ExampleJackrabbit" location="component://example/widget/example/ExampleMenus.xml"/>
- </decorator-section>
- <decorator-section name="body">
- <container style="clear" />
- <section>
- <widgets>
- <decorator-section-include name="body" />
- </widgets>
- </section>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
-
<screen name="main">
<!-- This is the screen for the Main page in the Example component. A common pattern
in OFBiz is to have each component include a Main page as a starting point for
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleMenus.xml Thu Jun 7 18:48:16 2012
@@ -49,7 +49,6 @@ under the License.
<menu-item name="ExampleCharts" title="Chart examples">
<link target="ExampleBarChart"/>
</menu-item>
- <menu-item name="ExampleJackrabbit" title="${uiLabelMap.PageTitleExampleJackrabbit}"><link target="ExampleJackrabbitShowContentData"/></menu-item>
</menu>
<menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
@@ -103,12 +102,4 @@ under the License.
<menu-item name="ExampleBarChart" title="Bar chart"><link target="ExampleBarChart"/></menu-item>
<menu-item name="ExamplePieChart" title="Pie chart"><link target="ExamplePieChart"/></menu-item>
</menu>
-
- <menu name="ExampleJackrabbit" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
- <menu-item name="ExampleJackrabbitShowContentData" title="${uiLabelMap.ExampleJackrabbitShowContentData}"><link target="ExampleJackrabbitShowContentData"/></menu-item>
- <menu-item name="ExampleJackrabbitAddData" title="${uiLabelMap.ExampleAddNewContentEntry}"><link target="ExampleJackrabbitAddData"/></menu-item>
- <menu-item name="ExampleJackrabbitUploadFileData" title="${uiLabelMap.ExampleJackrabbitUploadFileData}"><link target="ExampleJackrabbitUploadFileData"/></menu-item>
- <menu-item name="ExampleJackrabbitShowUploadedFiles" title="${uiLabelMap.ExampleJackrabbitShowUploadedFiles}"><link target="ExampleJackrabbitShowUploadedFiles"/></menu-item>
- <menu-item name="ExampleJackrabbitScanRepositoryStrukture" title="${uiLabelMap.ExampleScanRepositoryStrukture}"><link target="ExampleJackrabbitScanRepositoryStructure"/></menu-item>
- </menu>
</menus>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml?rev=1347754&r1=1347753&r2=1347754&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/exampleext/widget/example/CommonScreens.xml Thu Jun 7 18:48:16 2012
@@ -117,12 +117,4 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="CommonExampleJackrabbitDecorator">
- <section>
- <widgets>
- <include-screen name="CommonExampleJackrabbitDecorator" location="component://example/widget/example/CommonScreens.xml"/>
- </widgets>
- </section>
- </screen>
-
</screens>
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy
------------------------------------------------------------------------------
Merged /ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat
------------------------------------------------------------------------------
Merged /ofbiz/trunk/tools/mergefromtrunk.bat:r1346324-1347750
Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh
------------------------------------------------------------------------------
Merged /ofbiz/trunk/tools/mergefromtrunk.sh:r1346324-1347750