svn commit: r1341406 - in /ofbiz/branches/release11.04: ./ framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy

Author: jleroux
Date: Tue May 22 11:12:44 2012
New Revision: 1341406

URL: http://svn.apache.org/viewvc?rev=1341406&view=rev
Log:
"Applied fix from trunk for revision: 1341399"
------------------------------------------------------------------------
r1341399 | jleroux | 2012-05-22 12:57:13 +0200 (mar., 22 mai 2012) | 1 line

2 missing ASL2 headers, while at it...
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
    ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1341399

Modified: ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java?rev=1341406&r1=1341405&r2=1341406&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java (original)
+++ ofbiz/branches/release11.04/framework/common/src/org/ofbiz/common/JsLanguageFileMappingCreator.java Tue May 22 11:12:44 2012
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *******************************************************************************/
+
 package org.ofbiz.common;
 
 import java.io.File;

Modified: ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy?rev=1341406&r1=1341405&r2=1341406&view=diff
==============================================================================
--- ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy (original)
+++ ofbiz/branches/release11.04/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/OnePageCheckoutOptions.groovy Tue May 22 11:12:44 2012
@@ -1,8 +1,27 @@
-import org.ofbiz.order.shoppingcart.shipping.*;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ import org.ofbiz.order.shoppingcart.shipping.*;
 
 shoppingCart = session.getAttribute("shoppingCart");
 
 // Reassign items requiring drop-shipping to new or existing drop-ship groups
 if (shoppingCart) {
- shoppingCart.createDropShipGroups(dispatcher);
+  shoppingCart.createDropShipGroups(dispatcher);
 }