@@ -71,72 +71,6 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
<!-- this ant script runs testng natively -->
<execution>
<id>cobertura</id>
<phase>package</phase>
<configuration>
<tasks unless="maven.test.skip">
<taskdef classpathref="maven.test.classpath" resource="tasks.properties" />
<cobertura-instrument todir="target/instrumented" datafile="target/instrumented/cobertura.ser" classpathref="maven.test.classpath">
<ignore regex="org.apache.log4j.*" />
<fileset dir="${project.build.outputDirectory}">
<include name="**/*.class" />
<exclude name="**/*Test.class" />
</fileset>
</cobertura-instrument>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
<version>1.7.1</version>
<exclusions>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.42</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
@@ -186,10 +120,6 @@
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-contentmanagement-module</artifactId>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -46,76 +46,6 @@
<timezone>-6</timezone>
</developer>
</developers>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
<!-- this ant script runs testng natively -->
<execution>
<id>cobertura</id>
<phase>package</phase>
<configuration>
<tasks unless="maven.test.skip">
<taskdef classpathref="maven.test.classpath" resource="tasks.properties" />
<cobertura-instrument todir="target/instrumented" datafile="target/instrumented/cobertura.ser" classpathref="maven.test.classpath">
<ignore regex="org.apache.log4j.*" />
<fileset dir="${project.build.outputDirectory}">
<include name="**/*.class" />
<exclude name="**/*Test.class" />
</fileset>
</cobertura-instrument>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
<version>1.7.1</version>
<exclusions>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.42</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>blc-development</id>
@@ -159,10 +89,6 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
</dependency>
<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
@@ -71,72 +71,6 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
<!-- this ant script runs testng natively -->
<execution>
<id>cobertura</id>
<phase>package</phase>
<configuration>
<tasks unless="maven.test.skip">
<taskdef classpathref="maven.test.classpath" resource="tasks.properties" />
<cobertura-instrument todir="target/instrumented" datafile="target/instrumented/cobertura.ser" classpathref="maven.test.classpath">
<ignore regex="org.apache.log4j.*" />
<fileset dir="${project.build.outputDirectory}">
<include name="**/*.class" />
<exclude name="**/*Test.class" />
</fileset>
</cobertura-instrument>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
<version>1.7.1</version>
<exclusions>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.42</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
@@ -184,10 +118,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>broadleaf</artifactId>
<groupId>org.broadleafcommerce</groupId>
<version>1.6.0-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>integration</artifactId>
<name>BroadleafCommerce Integration</name>
<description>BroadleafCommerce Integration</description>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>broadleaf</artifactId>
<groupId>org.broadleafcommerce</groupId>
<version>1.6.0-M2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>integration</artifactId>
<name>BroadleafCommerce Integration</name>
<description>BroadleafCommerce Integration</description>
<url>http://www.broadleafcommerce.org</url>
<licenses>
<license>
@@ -46,262 +47,82 @@
<timezone>-6</timezone>
</developer>
</developers>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.3</version>
<executions>
<!-- this ant script runs testng natively -->
<execution>
<id>testng</id>
<phase>test</phase>
<configuration>
<tasks unless="skipTests">
<property name="framework" location="../core/broadleaf-framework" />
<property name="frameworkWeb" location="../core/broadleaf-framework-web" />
<property name="profile" location="../core/broadleaf-profile" />
<property name="profileWeb" location="../core/broadleaf-profile-web" />
<property name="usps" location="../module/broadleaf-usps" />
<property name="cybersource" location="../module/broadleaf-cybersource" />
<path id="test.path">
<pathelement location="${profile}/target/instrumented" />
<pathelement location="${profileWeb}/target/instrumented" />
<pathelement location="${framework}/target/instrumented" />
<pathelement location="${frameworkWeb}/target/instrumented" />
<pathelement location="${usps}/target/instrumented" />
<pathelement location="${cybersource}/target/instrumented" />
<path refid="maven.test.classpath" />
<pathelement location="../../BroadleafCommerceConfig/src" />
</path>
<property name="myproperty" refid="test.path" />
<echo message="${myproperty}" />
<taskdef resource="testngtasks" classpath="testng.jar" classpathref="test.path" />
<taskdef classpathref="test.path" resource="tasks.properties" />
<copy file="${framework}/target/instrumented/cobertura.ser" tofile="target/instrumented/cobertura.ser" />
<cobertura-merge datafile="target/instrumented/cobertura.ser">
<fileset dir="${frameworkWeb}/target/instrumented">
<include name="cobertura.ser" />
</fileset>
<fileset dir="${profile}/target/instrumented">
<include name="cobertura.ser" />
</fileset>
<fileset dir="${profileWeb}/target/instrumented">
<include name="cobertura.ser" />
</fileset>
<fileset dir="${usps}/target/instrumented">
<include name="cobertura.ser" />
</fileset>
<fileset dir="${cybersource}/target/instrumented">
<include name="cobertura.ser" />
</fileset>
</cobertura-merge>
<testng classpathref="test.path" outputdir="target/test-reports" haltonfailure="true">
<jvmarg value="-Xmx512M" />
<sysproperty key="net.sourceforge.cobertura.datafile" file="target/instrumented/cobertura.ser" />
<xmlfileset dir="src/test/resources" includes="*testng.xml" />
</testng>
<mkdir dir="target/surefire-reports" />
<junitreport todir="target/surefire-reports">
<fileset dir="target/test-reports">
<include name="**/*.xml" />
</fileset>
<report format="noframes" todir="target/surefire-reports" />
</junitreport>
<cobertura-report format="html" destdir="target/cobertura-reports" datafile="target/instrumented/cobertura.ser">
<fileset dir="${framework}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${frameworkWeb}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${profile}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${profileWeb}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${usps}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${cybersource}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
</cobertura-report>
<cobertura-report format="xml" destdir="target/cobertura-reports" datafile="target/instrumented/cobertura.ser">
<fileset dir="${framework}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${frameworkWeb}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${profile}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${profileWeb}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${usps}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
<fileset dir="${cybersource}/src/main/java">
<include name="**/*.java" />
<exclude name="**/*.xml" />
</fileset>
</cobertura-report>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-junit</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
<version>1.8</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-jsch</artifactId>
<version>1.7.1</version>
<exclusions>
<exclusion>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.42</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<version>1.0b3</version>
<exclusions>
<exclusion>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-profile</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-profile-web</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-framework-web</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-framework</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-usps</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-cybersource</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-admin-module</artifactId>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<type>jar</type>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>cobertura</groupId>
<artifactId>cobertura</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>-Xmx512m</argLine>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-profile</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-profile-web</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-framework-web</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-framework</artifactId>
</dependency>
<dependency>
<groupId>org.broadleafcommerce</groupId>
<artifactId>broadleaf-admin-module</artifactId>
</dependency>
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<type>jar</type>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
</project>
@@ -61,7 +61,6 @@
<property name="propertyLocations">
<set>
<value>classpath:config/bc/</value>
<value>classpath:config/bc/test/</value>
</set>
</property>
<property name="environments">
@@ -86,72 +85,9 @@
class="org.broadleafcommerce.common.email.service.info.EmailInfo"
parent="baseEmailInfo">
</bean>

<bean id="blCreditCardModule" class="org.broadleafcommerce.checkout.service.DummyCreditCardModule"/>

<bean id="blUSPSShippingModule" class="org.broadleafcommerce.pricing.service.module.USPSSingleItemPerPackageShippingCalculationModule">
<property name="defaultModule" value="true"/>
<property name="originationPostalCode" value="10022"/>
</bean>

<bean id="blShippingCalculationService" class="org.broadleafcommerce.vendor.usps.service.USPSShippingCalculationServiceImpl">
<property name="uspsCharSet" value="${usps.charset}"/>
<property name="uspsPassword" value="${usps.password}"/>
<property name="uspsServerName" value="${usps.server.name}"/>
<property name="uspsServiceAPI" value="${usps.service.api}"/>
<property name="uspsUserName" value="${usps.user.name}"/>
<property name="failureReportingThreshold" value="10"/>
<property name="httpProtocol" value="${usps.http.protocol}"/>
<property name="uspsShippingAPI" value="${usps.shipping.api}"/>
<property name="rateRequestElement" value="${usps.rate.request.tag}"/>
<property name="uspsRequestValidator">
<bean class="org.broadleafcommerce.vendor.usps.service.message.USPSRequestValidator">
<constructor-arg>
<bean class="org.broadleafcommerce.common.util.EnvironmentFactoryBean">
<constructor-arg value="${usps.rate.request.validator}"/>
</bean>
</constructor-arg>
</bean>
</property>
<property name="uspsRequestBuilder">
<bean class="org.broadleafcommerce.common.util.EnvironmentFactoryBean">
<constructor-arg value="${usps.rate.request.builder}"/>
</bean>
</property>
<property name="uspsResponseBuilder">
<bean class="org.broadleafcommerce.common.util.EnvironmentFactoryBean">
<constructor-arg value="${usps.rate.response.builder}"/>
</bean>
</property>
</bean>

<bean id="blCyberSourceCreditCardPaymentService" class="org.broadleafcommerce.vendor.cybersource.service.payment.CyberSourceCreditCardPaymentServiceImpl">
<property name="failureReportingThreshold" value="10"/>
<property name="idGenerationService" ref="blIdGenerationService"/>
</bean>

<bean id="blCyberSourceTaxService" class="org.broadleafcommerce.vendor.cybersource.service.tax.CyberSourceTaxServiceImpl">
<property name="failureReportingThreshold" value="10"/>
<property name="idGenerationService" ref="blIdGenerationService"/>
<property name="isCacheEnabled" value="true"/>
</bean>

<bean id="blCyberSourceServiceManager" class="org.broadleafcommerce.vendor.cybersource.service.CyberSourceServiceManagerImpl">
<property name="merchantId" value="${cybersource.merchant.id}"/>
<property name="serverUrl" value="${cybersource.server.url}"/>
<property name="libVersion" value="${cybersource.lib.version}"/>
<property name="registeredServices">
<list>
<ref bean="blCyberSourceCreditCardPaymentService"/>
<ref bean="blCyberSourceTaxService"/>
</list>
</property>
</bean>

<bean id="cyberSourcePasswordCallback" class="org.broadleafcommerce.vendor.cybersource.service.CyberSourcePasswordCallback">
<property name="transactionKey" value="${cybersource.transaction.key}"/>
</bean>

<bean id="compositeStatusHandler" class="org.broadleafcommerce.common.vendor.service.monitor.handler.CompositeStatusHandler">
<property name="handlers">
<list>
@@ -168,16 +104,6 @@
</property>
</bean>

<bean id="blServiceMonitor" class="org.broadleafcommerce.common.vendor.service.monitor.ServiceMonitor" init-method="init">
<property name="defaultHandler" ref="compositeStatusHandler"/>
<property name="serviceHandlers">
<map>
<entry key-ref="blShippingCalculationService" value-ref="compositeStatusHandler"/>
<entry key-ref="blCyberSourceCreditCardPaymentService" value-ref="compositeStatusHandler"/>
</map>
</property>
</bean>

<tx:advice id="blTxAdvice" transaction-manager="blTransactionManager">
<tx:attributes>
<tx:method name="*" propagation="REQUIRED"/>

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -109,7 +109,7 @@ public void testOfferAppliesToItemsInCategoryAndOrderValueGreaterThanFifty() {
public void testBasicMVELFunctions() {
//First, set up out functions
HashMap<String, Object> functionMap = new HashMap<String, Object>();
StringBuffer functions = new StringBuffer("def any(x, y) { System.out.println(fg); return x or y } def all(x, y) { return x and y } ");
StringBuffer functions = new StringBuffer("def any(x, y) { return x or y } def all(x, y) { return x and y } ");
MVEL.eval(functions.toString(), functionMap); //This stores that functions in the map we pass in.

HashMap<String, Object> vars = new HashMap<String, Object>(functionMap); //Now, we need to pass the functions in to our variable map

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -19,7 +19,6 @@
<package name="org.broadleafcommerce.security.service"></package>
<package name="org.broadleafcommerce.taglib"></package>
<package name="org.broadleafcommerce.test"></package>
<package name="org.broadleafcommerce.vendor"></package>
<package name="org.broadleafcommerce.common.time.time"></package>
</packages>
</test>

This file was deleted.

This file was deleted.