Merge pull request BroadleafCommerce#319 from BroadleafCommerce/qa-1026-admin-standalone

Allow the admin to run separate from any other Broadleaf deependencies

Author: phillipuniverse

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/provider/HTMLFieldPersistenceProvider.java renamed to admin/broadleaf-contentmanagement-module/src/main/java/org/broadleafcommerce/cms/admin/server/persistence/provider/HTMLFieldPersistenceProvider.java

@@ -17,12 +17,13 @@
  * limitations under the License.
  * #L%
  */
-package org.broadleafcommerce.openadmin.server.service.persistence.module.provider;
+package org.broadleafcommerce.cms.admin.server.persistence.provider;
 
 import org.broadleafcommerce.common.presentation.client.SupportedFieldType;
 import org.broadleafcommerce.common.web.BroadleafRequestContext;
 import org.broadleafcommerce.openadmin.dto.Property;
 import org.broadleafcommerce.openadmin.server.service.persistence.PersistenceException;
+import org.broadleafcommerce.openadmin.server.service.persistence.module.provider.FieldPersistenceProviderAdapter;
 import org.broadleafcommerce.openadmin.server.service.persistence.module.provider.request.ExtractValueRequest;
 import org.broadleafcommerce.openadmin.server.service.persistence.module.provider.request.PopulateValueRequest;
 import org.broadleafcommerce.openadmin.server.service.type.FieldProviderResponse;

admin/broadleaf-contentmanagement-module/src/main/resources/applicationContext-servlet-cms-contentCreator.xml

@@ -32,6 +32,13 @@
         already be picked up in the global component scan included in the root context (from bl-cms-contentCreator-applicationContext)-->
     <context:component-scan base-package="org.broadleafcommerce.cms.admin.web.controller" />
 
+    <bean id="blAdminStructuredContentController" class="org.broadleafcommerce.cms.admin.web.controller.AdminStructuredContentController" />
+    
+    <bean id="multipartResolver"
+        class="org.springframework.web.multipart.commons.CommonsMultipartResolver">     
+        <property name="maxUploadSize" value="${asset.server.max.uploadable.file.size}"/>
+    </bean>
+    
     <aop:config/>
 
 </beans>

admin/broadleaf-contentmanagement-module/src/main/resources/bl-cms-contentCreator-applicationContext.xml

@@ -47,6 +47,14 @@
             </list>
         </property>
     </bean>
+    
+    <bean id="blPersistenceProviders" class="org.broadleafcommerce.common.util.SortedListFactoryBean" scope="prototype">
+        <property name="sourceList">
+            <list>
+                <ref bean="blHTMLFieldPersistenceProvider"/>
+            </list>
+        </property>
+    </bean>
 
    <mo:override id="blMetadataOverrides">
         <mo:overrideItem configurationKey="targetProduct">

admin/broadleaf-open-admin-platform/pom.xml

@@ -221,6 +221,10 @@
             <artifactId>imageio-jpeg</artifactId>
         </dependency>
         <!-- Tests -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/dao/provider/metadata/AdornedTargetCollectionFieldMetadataProvider.java

@@ -71,6 +71,7 @@ protected boolean canHandleFieldForConfiguredMetadata(AddMetadataRequest addMeta
         return annot != null;
     }
 
+    @Override
     protected boolean canHandleFieldForTypeMetadata(AddMetadataFromFieldTypeRequest addMetadataFromFieldTypeRequest, Map<String, FieldMetadata> metadata) {
         AdminPresentationAdornedTargetCollection annot = addMetadataFromFieldTypeRequest.getRequestedField().getAnnotation(AdminPresentationAdornedTargetCollection.class);
         return annot != null;
@@ -504,8 +505,12 @@ protected void buildAdornedTargetCollectionMetadata(Class<?> parentClass, Class<
                 try {
                     ParameterizedType pt = (ParameterizedType) field.getGenericType();
                     java.lang.reflect.Type collectionType = pt.getActualTypeArguments()[0];
-                    String ceilingEntityName = ((Class<?>) collectionType).getName();
-                    collectionTarget = entityConfiguration.lookupEntityClass(ceilingEntityName);
+                    collectionTarget = (Class<?>) collectionType;
+                    // Only check entityConfiguration if it's an interface since I can't determine what the
+                    // Hibernate class is from that
+                    if (collectionTarget.isInterface()) {
+                        collectionTarget = entityConfiguration.lookupEntityClass(collectionTarget.getName());
+                    }
                     break checkCeiling;
                 } catch (NoSuchBeanDefinitionException e) {
                     // We weren't successful at looking at entity configuration to find the type of this collection.

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/controller/entity/AdminBasicEntityController.java

@@ -53,6 +53,7 @@
 import org.broadleafcommerce.openadmin.server.service.persistence.PersistenceResponse;
 import org.broadleafcommerce.openadmin.server.service.persistence.module.BasicPersistenceModule;
 import org.broadleafcommerce.openadmin.web.controller.AdminAbstractController;
+import org.broadleafcommerce.openadmin.web.controller.modal.ModalHeaderType;
 import org.broadleafcommerce.openadmin.web.editor.NonNullBooleanEditor;
 import org.broadleafcommerce.openadmin.web.form.component.DefaultListGridActions;
 import org.broadleafcommerce.openadmin.web.form.component.ListGrid;
@@ -62,7 +63,6 @@
 import org.broadleafcommerce.openadmin.web.form.entity.EntityFormAction;
 import org.broadleafcommerce.openadmin.web.form.entity.Field;
 import org.broadleafcommerce.openadmin.web.form.entity.Tab;
-import org.broadleafcommerce.openadmin.web.controller.modal.ModalHeaderType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.stereotype.Controller;
@@ -143,6 +143,11 @@ public String viewEntityList(HttpServletRequest request, HttpServletResponse res
         DynamicResultSet drs =  service.getRecords(ppr).getDynamicResultSet();
 
         ListGrid listGrid = formService.buildMainListGrid(drs, cmd, sectionKey, crumbs);
+        
+        if (CollectionUtils.isEmpty(listGrid.getHeaderFields())) {
+            throw new IllegalStateException("At least 1 field must be set to prominent to display in a main grid");
+        }
+        
         List<EntityFormAction> mainActions = new ArrayList<EntityFormAction>();
         addAddActionIfAllowed(sectionClassName, cmd, mainActions);
         extensionManager.getProxy().addAdditionalMainActions(sectionClassName, mainActions);

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/web/service/FormBuilderServiceImpl.java

@@ -150,7 +150,7 @@ public ListGrid buildMainListGrid(DynamicResultSet drs, ClassMetadata cmd, Strin
         List<Field> headerFields = new ArrayList<Field>();
         ListGrid.Type type = ListGrid.Type.MAIN;
         String idProperty = "id";
-
+        
         for (Property p : cmd.getProperties()) {
             if (p.getMetadata() instanceof BasicFieldMetadata) {
                 BasicFieldMetadata fmd = (BasicFieldMetadata) p.getMetadata();
@@ -194,7 +194,7 @@ protected Field createHeaderField(Property p, BasicFieldMetadata fmd) {
         }
 
         hf.withName(p.getName())
-          .withFriendlyName(fmd.getFriendlyName())
+          .withFriendlyName(StringUtils.isNotEmpty(fmd.getFriendlyName()) ? fmd.getFriendlyName() : p.getName())
           .withOrder(fmd.getGridOrder())
           .withColumnWidth(fmd.getColumnWidth())
           .withForeignKeyDisplayValueProperty(fmd.getForeignKeyDisplayValueProperty())

admin/broadleaf-open-admin-platform/src/main/resources/applicationContext-servlet-open-admin.xml

@@ -41,11 +41,6 @@
         <property name="order" value="1"/>
     </bean>
 
-    <bean id="multipartResolver"
-        class="org.springframework.web.multipart.commons.CommonsMultipartResolver">     
-        <property name="maxUploadSize" value="${asset.server.max.uploadable.file.size}"/>
-    </bean>    
-    
     <mvc:annotation-driven>
         <!-- This changes the ordering of the message converters such that JSON appears prior to any XML converters -->
         <mvc:message-converters>
@@ -59,6 +54,8 @@
 
     <context:component-scan base-package="org.broadleafcommerce.openadmin.web.controller" />
 
+    <bean id="blConfiguration" class="org.broadleafcommerce.common.config.RuntimeEnvironmentPropertiesConfigurer" />
+    
     <bean id="blAdminDialectProcessors" class="org.springframework.beans.factory.config.SetFactoryBean">
         <property name="sourceSet">
             <set>
@@ -68,6 +65,7 @@
                 <ref bean="blAdminSectionHrefProcessor"/>
                 <ref bean="blAdminFieldBuilderProcessor"/>
                 <ref bean="blErrorsProcessor"/>
+                
             </set>
         </property>
     </bean>

admin/broadleaf-open-admin-platform/src/main/resources/bl-open-admin-contentClient-applicationContext.xml

@@ -115,7 +115,6 @@
     <bean id="blPersistenceProviders" class="org.broadleafcommerce.common.util.SortedListFactoryBean" scope="prototype">
         <property name="sourceList">
             <list>
-                <ref bean="blHTMLFieldPersistenceProvider"/>
                 <ref bean="blBasicFieldPersistenceProvider"/>
                 <ref bean="blRuleFieldPersistenceProvider"/>                
                 <ref bean="blMapFieldPersistenceProvider"/>

admin/broadleaf-open-admin-platform/src/main/resources/open_admin_style/templates/modules/modalContainer.html

@@ -15,7 +15,7 @@ <h3 id="myModalLabel" th:inline="text" th:switch="${modalHeaderType}">
 
             <span th:case="'addCollectionItem'" th:remove="tag">
                 [[#{modal.title.add}]] 
-                <span th:remove="tag" th:if="${#strings.isEmpty(collectionProperty.metadata.friendlyName)}" th:text="#{${collectionProperty.metadata.name}}" />
+                <span th:remove="tag" th:if="${#strings.isEmpty(collectionProperty.metadata.friendlyName)}" th:text="#{${collectionProperty.name}}" />
                 <span th:remove="tag" th:unless="${#strings.isEmpty(collectionProperty.metadata.friendlyName)}" th:text="#{${collectionProperty.metadata.friendlyName}}" />
             </span>
 

common/src/main/java/org/broadleafcommerce/common/breadcrumbs/processor/BreadcrumbProcessor.java

@@ -23,7 +23,6 @@
 import org.broadleafcommerce.common.breadcrumbs.service.BreadcrumbService;
 import org.broadleafcommerce.common.web.BroadleafRequestContext;
 import org.broadleafcommerce.common.web.dialect.AbstractModelVariableModifierProcessor;
-import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import org.thymeleaf.Arguments;
 import org.thymeleaf.dom.Element;
@@ -39,7 +38,6 @@
  *
  * @author bpolster
  */
-@Component("blBreadcrumbProcessor")
 public class BreadcrumbProcessor extends AbstractModelVariableModifierProcessor {
 
     @Resource(name = "blBreadcrumbService")

core/broadleaf-framework-web/src/main/java/org/broadleafcommerce/core/web/processor/FormProcessor.java renamed to common/src/main/java/org/broadleafcommerce/common/web/processor/FormProcessor.java

@@ -17,7 +17,7 @@
  * limitations under the License.
  * #L%
  */
-package org.broadleafcommerce.core.web.processor;
+package org.broadleafcommerce.common.web.processor;
 
 import org.broadleafcommerce.common.exception.ServiceException;
 import org.broadleafcommerce.common.security.handler.CsrfFilter;

common/src/main/resources/bl-common-applicationContext-persistence.xml

@@ -41,13 +41,28 @@
         </property>
     </bean>
 
+    <bean id="blCacheManager" class="org.broadleafcommerce.common.extensibility.cache.ehcache.MergeEhCacheManagerFactoryBean">
+        <property name="shared" value="true"/>
+    </bean>
+
     <bean id="blMergedCacheConfigLocations" class="org.springframework.beans.factory.config.ListFactoryBean">
         <property name="sourceList">
             <list>
                 <value>classpath:bl-common-ehcache.xml</value>
             </list>
         </property>
     </bean>
+    
+    <bean id="blTransactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+        <property name="entityManagerFactory" ref="entityManagerFactory" />
+    </bean>
+
+    <tx:advice id="blTxAdvice" transaction-manager="blTransactionManager">
+        <tx:attributes>
+          <tx:method name="*" propagation="REQUIRED"/>
+          <tx:method name="findNextId" propagation="REQUIRES_NEW"/>
+        </tx:attributes>
+    </tx:advice>
 
     <bean id="blMergedPersistenceXmlLocations" class="org.springframework.beans.factory.config.ListFactoryBean">
         <property name="sourceList">

common/src/main/resources/bl-common-applicationContext.xml

@@ -342,10 +342,14 @@
         </property>
     </bean>
 
+    <bean id="thymeleafSpringStandardDialect" class="org.thymeleaf.spring4.dialect.SpringStandardDialect" />
+    
     <bean id="blVariableExpressionEvaluator" class="org.broadleafcommerce.common.web.expression.BroadleafVariableExpressionEvaluator" />
     <bean id="blDataDrivenEnumerationProcessor" class="org.broadleafcommerce.common.web.processor.DataDrivenEnumerationProcessor" />
     <bean id="blResourceBundleProcessor" class="org.broadleafcommerce.common.web.processor.ResourceBundleProcessor" />
     <bean id="blConfigVariableProcessor" class="org.broadleafcommerce.common.web.processor.ConfigVariableProcessor" />
+    <bean id="blBreadcrumbProcessor" class="org.broadleafcommerce.common.breadcrumbs.processor.BreadcrumbProcessor" />
+    <bean id="blFormProcessor" class="org.broadleafcommerce.common.web.processor.FormProcessor" />
 
     <!-- This core Broadleaf dialect should not be extended by implementors. Instead, define your -->
     <!-- own dialect and add your processors there. -->
@@ -356,10 +360,28 @@
                 <ref bean="blResourceBundleProcessor" />
                 <ref bean="blConfigVariableProcessor" />
                 <ref bean="blBreadcrumbProcessor" />
+                <ref bean="blFormProcessor" />
             </set>
         </property>
     </bean>
 
+    <bean id="blDialect" class="org.broadleafcommerce.common.web.dialect.BLCDialect">
+        <property name="processors" ref="blDialectProcessors" />
+    </bean>
+    
+    <!-- This list factory bean will accept classes that implment the BroadleafVariableExpression interface. -->
+    <!-- This provides the ability to inject custom expression evaluators into Thymeleaf. -->
+    <bean id="blVariableExpressions" class="org.springframework.beans.factory.config.ListFactoryBean">
+        <property name="sourceList">
+            <list>
+                <bean class="org.broadleafcommerce.common.web.expression.NullBroadleafVariableExpression" />
+                <bean class="org.broadleafcommerce.common.web.expression.BRCVariableExpression" />                
+                <bean class="org.broadleafcommerce.common.web.expression.PropertiesVariableExpression" />
+                <bean class="org.broadleafcommerce.common.web.payment.expression.PaymentGatewayFieldVariableExpression"/>
+            </list>
+        </property>
+    </bean>
+    
     <bean id="blSiteMapGenerators" class="org.springframework.beans.factory.config.ListFactoryBean">
         <property name="sourceList">
             <list>