Skip to content

Commit

Permalink
更新至最新11.04.01和增加jQuery EasyUI
Browse files Browse the repository at this point in the history
  • Loading branch information
@billhongs
billhongs committed Dec 9, 2012
1 parent b0d1361 commit ccf7b0f
Show file tree
Hide file tree
Showing 430 changed files with 52,419 additions and 212 deletions.
43 changes: 13 additions & 30 deletions .classpath
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.35-annotations-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.35-el-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.35-jsp-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.35-servlet-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
<classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/>
Expand Down Expand Up @@ -124,15 +124,15 @@
<classpathentry kind="lib" path="framework/birt/lib/saaj.jar"/>
<classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/>
<classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-ecj-3.7.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-catalina.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-catalina-ha.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-catalina-tribes.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-jasper.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-jasper-el.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-tomcat-coyote.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-tomcat-dbcp.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.35-tomcat-juli.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-ecj-3.7.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-catalina.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-jasper.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-jasper-el.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar"/>
<classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.4.jar"/>
<classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/>
<classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/>
Expand Down Expand Up @@ -173,8 +173,6 @@
<classpathentry kind="lib" path="specialpurpose/ebaystore/lib/ebaysdkcore.jar"/>
<classpathentry kind="lib" path="specialpurpose/ebaystore/lib/helper.jar"/>
<classpathentry excluding="org/ofbiz/accounting/thirdparty/cybersource/**|org/ofbiz/accounting/thirdparty/verisign/**|org/ofbiz/accounting/thirdparty/worldpay/**|org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java|org/ofbiz/accounting/thirdparty/orbital/**|org/ofbiz/accounting/thirdparty/securepay/**|org/ofbiz/accounting/thirdparty/ideal/**" kind="src" path="applications/accounting/src"/>
<classpathentry kind="src" path="specialpurpose/greentea/src"/>
<classpathentry kind="src" path="specialpurpose/recommender/src"/>
<classpathentry excluding="org/ofbiz/content/openoffice/|org/ofbiz/content/report/" kind="src" path="applications/content/src"/>
<classpathentry kind="src" path="applications/manufacturing/src"/>
<classpathentry kind="src" path="applications/marketing/src"/>
Expand Down Expand Up @@ -221,20 +219,5 @@
<classpathentry excluding="org/enhydra/|org/ofbiz/" kind="src" path="specialpurpose/shark/src"/>
<classpathentry kind="src" path="specialpurpose/workflow/src"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="lib" path="specialpurpose/greentea/lib/apache-solr-solrj-4.0.0.jar"/>
<classpathentry kind="lib" path="specialpurpose/greentea/lib/apache-solr-velocity-4.0.0.jar"/>
<classpathentry kind="lib" path="specialpurpose/greentea/lib/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/mahout-core-0.7.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/mahout-integration-0.7.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/mahout-math-0.7.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/slf4j-api-1.6.1.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/slf4j-jcl-1.6.1.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/slf4j-log4j12-1.6.1.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/guava-r09.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/uncommons-maths-1.2.2.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/hadoop-core-1.1.0.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/mahout-core-0.7-job.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/mahout-examples-0.7-job.jar"/>
<classpathentry kind="lib" path="specialpurpose/recommender/lib/mahout-examples-0.7.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ specialpurpose/projectmgr/build/
specialpurpose/webpos/build/
specialpurpose/shark/build/
specialpurpose/greentea/build/
specialpurpose/recommender/build/
ofbiz.jar
changelog
runtime/svninfo.ftl
Expand Down
26 changes: 13 additions & 13 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,25 @@ ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jms_1.1_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-annotations-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-el-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-jsp-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.35-servlet-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-annotations-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-el-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-jsp-api.jar
ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.36-servlet-api.jar
ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar
ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar
ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.7.jar
ofbiz/trunk/framework/base/lib/scripting/jansi-1.2.1.jar
ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar
ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-catalina-ha.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-catalina-tribes.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-catalina.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-jasper-el.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-jasper.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-tomcat-coyote.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-tomcat-dbcp.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-tomcat-juli.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-catalina-ha.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-catalina-tribes.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-catalina.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-jasper-el.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-jasper.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-tomcat-coyote.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-tomcat-dbcp.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.36-tomcat-juli.jar
ofbiz/trunk/framework/entity/lib/commons-dbcp-1.4.jar
ofbiz/trunk/framework/entity/lib/jdbc/derby-10.7.1.1.jar
ofbiz/trunk/framework/entity/lib/jdbc/derbytools-10.7.1.1.jar
Expand Down Expand Up @@ -2429,7 +2429,7 @@ ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.dom.svg_1.1.0.v200806040
ofbiz/trunk/framework/birt/lib/platform/plugins/org.eclipse.core.runtime.compatibility.registry_3.3.0.v20100520-1800/runtime_registry_compatibility.jar
ofbiz/trunk/framework/birt/lib/platform/plugins/org.mozilla.rhino_1.7.1.v20090608/lib/js.jar
ofbiz/trunk/framework/birt/lib/platform/plugins/org.w3c.sac_1.3.0.v20090608/lib/flute.jar
ofbiz/trunk/framework/catalina/lib/tomcat-6.0.35-ecj-3.7.jar
ofbiz/trunk/framework/catalina/lib/ecj-3.7.2.jar
=========================================================================
Eclipse Public License - v 1.0

Expand Down
8 changes: 1 addition & 7 deletions applications/content/ofbiz-component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,5 @@ under the License.
location="webapp/content"
base-permission="CONTENTMGR"
mount-point="/content"/>

<webapp name="ofbizhelp"
title="OFBiz Help"
server="default-server"
location="webapp/ofbizhelp"
base-permission="OFBTOOLS"
mount-point="/ofbizhelp"/>

</ofbiz-component>
160 changes: 156 additions & 4 deletions applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2249,7 +2249,26 @@ public void setShippingContactMechId(int idx, String shippingContactMechId) {
}
csi.setContactMechId(shippingContactMechId);
}


/**
* Sets @param shippingContactMechId in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param shippingContactMechId
*/
public void setAllShippingContactMechId(String shippingContactMechId) {
for(int x=0; x < shipInfo.size(); x++) {
this.setShippingContactMechId(x, shippingContactMechId);
}
}

/**
* Use alternative methods setShippingContactMechId(int idx, String shippingContactMechId)
* or setAllShippingContactMechId(String shippingContactMechId)
* <p>
* @deprecated
* @param shippingContactMechId
*/
public void setShippingContactMechId(String shippingContactMechId) {
this.setShippingContactMechId(0, shippingContactMechId);
}
Expand All @@ -2269,7 +2288,26 @@ public void setShipmentMethodTypeId(int idx, String shipmentMethodTypeId) {
CartShipInfo csi = this.getShipInfo(idx);
csi.shipmentMethodTypeId = shipmentMethodTypeId;
}


/**
* Sets @param shipmentMethodTypeId in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param shipmentMethodTypeId
*/
public void setAllShipmentMethodTypeId(String shipmentMethodTypeId) {
for(int x=0; x < shipInfo.size(); x++) {
this.setShipmentMethodTypeId(x, shipmentMethodTypeId);
}
}

/**
* Use alternative methods setShipmentMethodTypeId(int idx, String shipmentMethodTypeId)
* or setAllShipmentMethodTypeId(String shipmentMethodTypeId)
* <p>
* @deprecated
* @param shipmentMethodTypeId
*/
public void setShipmentMethodTypeId(String shipmentMethodTypeId) {
this.setShipmentMethodTypeId(0, shipmentMethodTypeId);
}
Expand Down Expand Up @@ -2317,7 +2355,26 @@ public void setShippingInstructions(int idx, String shippingInstructions) {
CartShipInfo csi = this.getShipInfo(idx);
csi.shippingInstructions = shippingInstructions;
}

/**
* Sets @param shippingInstructions in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param shippingInstructions
*/
public void setAllShippingInstructions(String shippingInstructions) {
for(int x=0; x < shipInfo.size(); x++) {
this.setShippingInstructions(x, shippingInstructions);
}
}

/**
* Use alternative methods setShippingInstructions(int idx, String shippingInstructions)
* or setAllShippingInstructions(String shippingInstructions)
* <p>
* @deprecated
* @param shippingInstructions
*/
public void setShippingInstructions(String shippingInstructions) {
this.setShippingInstructions(0, shippingInstructions);
}
Expand All @@ -2338,7 +2395,26 @@ public void setMaySplit(int idx, Boolean maySplit) {
csi.setMaySplit(maySplit);
}
}


/**
* Sets @param maySplit in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param maySplit
*/
public void setAllMaySplit(Boolean maySplit) {
for(int x=0; x < shipInfo.size(); x++) {
this.setMaySplit(x, maySplit);
}
}

/**
* Use alternative methods setMaySplit(int idx, Boolean maySplit)
* or setAllMaySplit(Boolean maySplit)
* <p>
* @deprecated
* @param maySplit
*/
public void setMaySplit(Boolean maySplit) {
this.setMaySplit(0, maySplit);
}
Expand All @@ -2358,6 +2434,25 @@ public void setGiftMessage(int idx, String giftMessage) {
csi.giftMessage = giftMessage;
}

/**
* Sets @param giftMessage in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param giftMessage
*/
public void setAllGiftMessage(String giftMessage) {
for(int x=0; x < shipInfo.size(); x++) {
this.setGiftMessage(x, giftMessage);
}
}

/**
* Use alternative methods setGiftMessage(int idx, String giftMessage)
* or setAllGiftMessage(String giftMessage)
* <p>
* @deprecated
* @param giftMessage
*/
public void setGiftMessage(String giftMessage) {
this.setGiftMessage(0, giftMessage);
}
Expand All @@ -2378,6 +2473,25 @@ public void setIsGift(int idx, Boolean isGift) {
}
}

/**
* Sets @param isGift in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param isGift
*/
public void setAllIsGift(Boolean isGift) {
for(int x=0; x < shipInfo.size(); x++) {
this.setIsGift(x, isGift);
}
}

/**
* Use alternative methods setIsGift(int idx, Boolean isGift)
* or setAllIsGift(Boolean isGift)
* <p>
* @deprecated
* @param isGift
*/
public void setIsGift(Boolean isGift) {
this.setIsGift(0, isGift);
}
Expand All @@ -2395,7 +2509,26 @@ public void setCarrierPartyId(int idx, String carrierPartyId) {
CartShipInfo csi = this.getShipInfo(idx);
csi.carrierPartyId = carrierPartyId;
}


/**
* Sets @param carrierPartyId in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param carrierPartyId
*/
public void setAllCarrierPartyId(String carrierPartyId) {
for(int x=0; x < shipInfo.size(); x++) {
this.setCarrierPartyId(x, carrierPartyId);
}
}

/**
* Use alternative methods setCarrierPartyId(int idx, String carrierPartyId)
* or setAllCarrierPartyId(String carrierPartyId)
* <p>
* @deprecated
* @param carrierPartyId
*/
public void setCarrierPartyId(String carrierPartyId) {
this.setCarrierPartyId(0, carrierPartyId);
}
Expand All @@ -2422,7 +2555,26 @@ public void setProductStoreShipMethId(int idx, String productStoreShipMethId) {
CartShipInfo csi = this.getShipInfo(idx);
csi.productStoreShipMethId = productStoreShipMethId;
}

/**
* Sets @param productStoreShipMethId in all ShipInfo(ShipGroups) associated
* with this ShoppingCart
* <p>
* @param productStoreShipMethId
*/
public void setAllProductStoreShipMethId(String productStoreShipMethId) {
for(int x=0; x < shipInfo.size(); x++) {
this.setProductStoreShipMethId(x, productStoreShipMethId);
}
}

/**
* Use alternative methods setProductStoreShipMethId(int idx, String productStoreShipMethId)
* or setAllProductStoreShipMethId(String productStoreShipMethId)
* <p>
* @deprecated
* @param productStoreShipMethId
*/
public void setProductStoreShipMethId(String productStoreShipMethId) {
this.setProductStoreShipMethId(0, productStoreShipMethId);
}
Expand Down
4 changes: 4 additions & 0 deletions applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,10 @@ public static String loadCartFromQuote(HttpServletRequest request, HttpServletRe
UtilMisc.<String, Object>toMap("quoteId", quoteId,
"applyQuoteAdjustments", "true",
"userLogin", userLogin));
if (!ServiceUtil.isSuccess(outMap)) {
request.setAttribute("_ERROR_MESSAGE_", ServiceUtil.getErrorMessage(outMap));
return "error";
}
cart = (ShoppingCart) outMap.get("shoppingCart");
} catch (GenericServiceException exc) {
request.setAttribute("_ERROR_MESSAGE_", exc.getMessage());
Expand Down
8 changes: 4 additions & 4 deletions applications/party/entitydef/entitymodel.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1693,16 +1693,16 @@ under the License.
<view-entity entity-name="PartyIdentificationAndParty"
package-name="org.ofbiz.party.party"
title="PartyIdentification and Party View Entity">
<member-entity entity-alias="PI" entity-name="PartyIdentification"/>
<member-entity entity-alias="PIN" entity-name="PartyIdentification"/>
<member-entity entity-alias="PIT" entity-name="PartyIdentificationType"/>
<member-entity entity-alias="PA" entity-name="Party"/>
<alias-all entity-alias="PI" />
<alias-all entity-alias="PIN" />
<alias-all entity-alias="PA" />
<alias name="partyIdentTypeDesc" field="description" entity-alias="PIT"/>
<view-link entity-alias="PI" rel-entity-alias="PA">
<view-link entity-alias="PIN" rel-entity-alias="PA">
<key-map field-name="partyId"/>
</view-link>
<view-link entity-alias="PI" rel-entity-alias="PIT">
<view-link entity-alias="PIN" rel-entity-alias="PIT">
<key-map field-name="partyIdentificationTypeId"/>
</view-link>
</view-entity>
Expand Down
Loading

0 comments on commit ccf7b0f

Please sign in to comment.