Merge tag 'broadleaf-4.0.0-GA'

[maven-release-plugin]  copy for tag broadleaf-4.0.0-GA

.gitignore

@@ -9,3 +9,5 @@ test-output
 .metadata
 *.ipr
 bin/
+**/*maven-eclipse.xml
+**/*externalToolBuilders

admin/broadleaf-admin-functional-tests/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.broadleafcommerce</groupId>
         <artifactId>admin</artifactId>
-        <version>3.1.13-GA</version>
+        <version>4.0.0-GA</version>
     </parent>
     <artifactId>broadleaf-admin-functional-tests</artifactId>
     <name>BroadleafCommerce Admin Functional Tests</name>
@@ -77,12 +77,18 @@
                     <excludes>
                         <exclude>**/browsertest/**</exclude>
                     </excludes>
+                    <argLine>${surefire.argLine}</argLine>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
             </plugin>
+            <!-- Jacoco Code Coverage Plugin -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -147,5 +153,10 @@
             <artifactId>selenium-chrome-driver</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>

admin/broadleaf-admin-functional-tests/src/main/groovy/org/broadleafcommerce/browsertest/page/EntityFormPage.groovy

@@ -55,6 +55,8 @@ class EntityFormPage extends AdminPage {
         tabs { container.find('.tabs-container dd') }
         form { container.find('form.entity-form') }
         submitButton(to: EntityFormPage) { container.find('button.submit-button') }
+        deleteButton(to: TopLevelEntity) { container.find('button.delete-button') }
+        closeButton(to: EntityFormPage) { container.find('button.close') }
         grids(required: false) { index ->
             moduleList ActionableListGridModule, container.find('.listgrid-container'), index
         }

admin/broadleaf-admin-module/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>admin</artifactId>
         <groupId>org.broadleafcommerce</groupId>
-        <version>3.1.13-GA</version>
+        <version>4.0.0-GA</version>
     </parent>
     <artifactId>broadleaf-admin-module</artifactId>
     <packaging>jar</packaging>
@@ -125,10 +125,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/extension/CategoryCustomPersistenceHandlerExtensionHandler.java

@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * BroadleafCommerce Framework
+ * %%
+ * Copyright (C) 2009 - 2013 Broadleaf Commerce
+ * %%
+ * Licensed 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.
+ * #L%
+ */
+package org.broadleafcommerce.admin.server.service.extension;
+
+import org.broadleafcommerce.common.exception.ServiceException;
+import org.broadleafcommerce.common.extension.ExtensionHandler;
+import org.broadleafcommerce.common.extension.ExtensionResultStatusType;
+import org.broadleafcommerce.core.catalog.domain.Category;
+import org.broadleafcommerce.openadmin.dto.PersistencePackage;
+
+/**
+ * Extension handler for {@link org.broadleafcommerce.admin.server.service.handler.CategoryCustomPersistenceHandler}
+ *
+ * @author Jeff Fischer
+ */
+public interface CategoryCustomPersistenceHandlerExtensionHandler extends ExtensionHandler {
+
+    /**
+     * Perform any special handling for the parent category during a category add
+     *
+     * @param category
+     * @return
+     */
+    ExtensionResultStatusType manageParentCategoryForAdd(PersistencePackage persistencePackage, Category category) throws ServiceException;
+
+    /**
+     * Perform any special handling for the parent category during a category update
+     *
+     * @param category
+     * @return
+     */
+    ExtensionResultStatusType manageParentCategoryForUpdate(PersistencePackage persistencePackage, Category category) throws ServiceException;
+}

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/extension/CategoryCustomPersistenceHandlerExtensionManager.java

@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * BroadleafCommerce Framework
+ * %%
+ * Copyright (C) 2009 - 2013 Broadleaf Commerce
+ * %%
+ * Licensed 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.
+ * #L%
+ */
+package org.broadleafcommerce.admin.server.service.extension;
+
+import org.broadleafcommerce.common.extension.ExtensionManager;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * Extension manager for {@link org.broadleafcommerce.admin.server.service.handler.CategoryCustomPersistenceHandler}
+ *
+ * @author Jeff Fischer
+ */
+@Service("blCategoryCustomPersistenceHandlerExtensionManager")
+public class CategoryCustomPersistenceHandlerExtensionManager extends ExtensionManager<CategoryCustomPersistenceHandlerExtensionHandler> {
+
+    public CategoryCustomPersistenceHandlerExtensionManager() {
+        super(CategoryCustomPersistenceHandlerExtensionHandler.class);
+    }
+
+}

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/extension/ProductCustomPersistenceHandlerExtensionHandler.java

@@ -0,0 +1,50 @@
+/*
+ * #%L
+ * BroadleafCommerce Framework
+ * %%
+ * Copyright (C) 2009 - 2013 Broadleaf Commerce
+ * %%
+ * Licensed 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.
+ * #L%
+ */
+package org.broadleafcommerce.admin.server.service.extension;
+
+import org.broadleafcommerce.common.exception.ServiceException;
+import org.broadleafcommerce.common.extension.ExtensionHandler;
+import org.broadleafcommerce.common.extension.ExtensionResultStatusType;
+import org.broadleafcommerce.core.catalog.domain.Product;
+import org.broadleafcommerce.openadmin.dto.PersistencePackage;
+
+/**
+ * Extension handler for {@link org.broadleafcommerce.admin.server.service.handler.ProductCustomPersistenceHandler}
+ *
+ * @author Jeff Fischer
+ */
+public interface ProductCustomPersistenceHandlerExtensionHandler extends ExtensionHandler {
+
+    /**
+     * Perform any special handling for the parent category of a product during a product add
+     *
+     * @param product
+     * @return
+     */
+    ExtensionResultStatusType manageParentCategoryForAdd(PersistencePackage persistencePackage, Product product) throws ServiceException;
+
+    /**
+     * Perform any special handling for the parent category of a product during a product update
+     *
+     * @param product
+     * @return
+     */
+    ExtensionResultStatusType manageParentCategoryForUpdate(PersistencePackage persistencePackage, Product product) throws ServiceException;
+}

admin/broadleaf-admin-module/src/main/java/org/broadleafcommerce/admin/server/service/extension/ProductCustomPersistenceHandlerExtensionManager.java

@@ -0,0 +1,38 @@
+/*
+ * #%L
+ * BroadleafCommerce Framework
+ * %%
+ * Copyright (C) 2009 - 2013 Broadleaf Commerce
+ * %%
+ * Licensed 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.
+ * #L%
+ */
+package org.broadleafcommerce.admin.server.service.extension;
+
+import org.broadleafcommerce.common.extension.ExtensionManager;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * Extension manager for {@link org.broadleafcommerce.admin.server.service.handler.ProductCustomPersistenceHandler}
+ *
+ * @author Jeff Fischer
+ */
+@Service("blProductCustomPersistenceHandlerExtensionManager")
+public class ProductCustomPersistenceHandlerExtensionManager extends ExtensionManager<ProductCustomPersistenceHandlerExtensionHandler> {
+
+    public ProductCustomPersistenceHandlerExtensionManager() {
+        super(ProductCustomPersistenceHandlerExtensionHandler.class);
+    }
+
+}