From 3f25924c1f1ae286305634699bad2e6ba7984b2b Mon Sep 17 00:00:00 2001 From: Phillip Verheyden Date: Thu, 21 Nov 2013 22:34:22 -0600 Subject: [PATCH] BroadleafCommerce/BroadleafCommerce#195 - Add the proper class transformer configuration for the max offer code uses fix. Also hook up Spring Instrument by default --- admin/build.xml | 2 ++ build.properties | 5 +-- .../src/main/resources/applicationContext.xml | 32 ++++++++++++++++-- lib/spring-instrument-3.2.2.RELEASE.jar | Bin 0 -> 7185 bytes site/build.xml | 9 +++-- 5 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 lib/spring-instrument-3.2.2.RELEASE.jar diff --git a/admin/build.xml b/admin/build.xml index 6862ec98b..5b6f3ee8f 100644 --- a/admin/build.xml +++ b/admin/build.xml @@ -28,6 +28,7 @@ + @@ -46,6 +47,7 @@ + diff --git a/build.properties b/build.properties index 877da81d5..38f78ba0e 100644 --- a/build.properties +++ b/build.properties @@ -30,7 +30,8 @@ ant.blCMSStorage.userName=sa ant.blCMSStorage.password=null ant.blCMSStorage.driverClassName=org.hsqldb.jdbcDriver -#optional - only required if you wish for the build-create-sql and build-update-sql tasks to include weaved items from modules -spring.instrument.path=/path/to/your/spring/instrument/jar +#Required for correct operation of some 3rd party modules +#Relative paths are from the ant build.xml files, so site/build.xml and admin/build.xml. +spring.instrument.path=../lib/spring-instrument-3.2.2.RELEASE.jar #End build-*-sql Ant Task Properties diff --git a/core/src/main/resources/applicationContext.xml b/core/src/main/resources/applicationContext.xml index f731dd0d9..4359a3adf 100644 --- a/core/src/main/resources/applicationContext.xml +++ b/core/src/main/resources/applicationContext.xml @@ -18,6 +18,34 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd"> - - + + + + + + + + + + org.broadleafcommerce.core.offer.domain.OfferAuditImpl + org.broadleafcommerce.core.offer.domain.OfferAuditWeaveImpl + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/lib/spring-instrument-3.2.2.RELEASE.jar b/lib/spring-instrument-3.2.2.RELEASE.jar new file mode 100644 index 0000000000000000000000000000000000000000..76e6d48cd1a8fa2d68363d479e04d262dea64f2f GIT binary patch literal 7185 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 - + + @@ -42,6 +43,7 @@ + @@ -60,6 +62,7 @@ + @@ -137,7 +140,7 @@ - + @@ -224,7 +227,7 @@ - +