Changeset 920 for branches/features/purchaseOrders/grails-app/conf

Timestamp:

May 7, 2011, 12:42:44 PM (14 years ago)

Author:

gav

Message:

Svn merge -r874:r919 trunk/ into branches/features/purchaseOrders.
This brings the purchaseOrder branch fully up to date.

Location:

branches/features/purchaseOrders

Files:

• . (modified) (1 prop)
• grails-app/conf/BuildConfig.groovy (modified) (3 diffs)
• grails-app/conf/SecurityConfig.groovy (modified) (1 diff)

branches/features/purchaseOrders/grails-app/conf/BuildConfig.groovy

@@ -19 +19 @@
 
 grails.war.resources = { stagingDir, args ->
-    // Remove some duplicate jars.
-    delete file: "${stagingDir}/WEB-INF/lib/jasperreports-2.0.5.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/jasperreports-3.1.2.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/aspectjrt-1.5.4.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/commons-digester-1.7.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/iText-2.0.8.jar"
+    // Remove some duplicate/not required jars.
+    // From export plugin lib dir.
     delete file: "${stagingDir}/WEB-INF/lib/iText-2.1.5.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/jfreechart-1.0.3.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/poi-3.0.2-FINAL-20080204.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/facebook-2.0.4.jar"
+    // From acegi plugin lib dir.
+    delete file: "${stagingDir}/WEB-INF/lib/facebook-java-api-2.0.4.jar"
+    delete file: "${stagingDir}/WEB-INF/lib/easymock.jar"
+    delete file: "${stagingDir}/WEB-INF/lib/cas-client-core-3.1.1.jar"
+    delete file: "${stagingDir}/WEB-INF/lib/openid4java-0.9.2.jar"
+
 }
 
@@ -57 +56 @@
     }
 
+    plugins {
+        runtime ':acegi:0.5.3'
+        runtime ':export:0.7'
+        runtime ':filterpane:0.7'
+        runtime ':help-balloons:1.4'
+        runtime(':jasper:1.1.3') {
+            transitive = false
+        }
+        runtime ':navigation:1.1.1'
+        runtime ':quartz:0.4.2'
+        runtime ':richui:0.8'
+        runtime ':searchable:0.6-SNAPSHOT'
+
+        test ':geb:0.6-SNAPSHOT'
+        test ':spock:0.5-groovy-1.7'
+    }
+
     dependencies {
         // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
@@ -62 +78 @@
         runtime 'mysql:mysql-connector-java:5.1.9'
 
+        // Japser plugin.
+        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
+            excludes 'antlr', 'commons-beanutils', 'commons-collections', 'commons-logging',
+                    'ant', 'mondrian', 'commons-javaflow','barbecue', 'xml-apis-ext','xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
+                    'xercesImpl','xmlParserAPIs','spring-core','bsh', 'spring-beans', 'jaxen', 'barcode4j','batik-svg-dom','batik-xml','batik-awt-util','batik-dom',
+                    'batik-css','batik-gvt','batik-script', 'batik-svggen','batik-util','batik-bridge','persistence-api','jdtcore','bcmail-jdk14','bcprov-jdk14','bctsp-jdk14'
+        }
         runtime('org.apache.poi:poi:3.5-FINAL') {
-            excludes 'servlet-api', 'commons-logging', 'log4j'
+            excludes 'log4j', 'commons-logging'
         }
 
-        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
-            excludes 'xml-apis'
-        }
-
+        // Origin unknown, still required?
         runtime('org.apache.ant:ant:1.7.1')
         runtime('org.apache.ant:ant-launcher:1.7.1')
 
-        test("org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release") {
+        test('org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release') {
             excludes 'xml-apis'
         }
     }
-    plugins {
-        test ":geb:0.6-SNAPSHOT"
-        test ":spock:0.5-groovy-1.7"
-    }
 
 }

branches/features/purchaseOrders/grails-app/conf/SecurityConfig.groovy

@@ -44 +44 @@
     '/plugins/*/css/**': ['IS_AUTHENTICATED_ANONYMOUSLY'],
     '/plugins/*/js/**': ['IS_AUTHENTICATED_ANONYMOUSLY'],
-    '/classDiagram*': ['IS_AUTHENTICATED_FULLY'],
-    '/classDiagram/**': ['IS_AUTHENTICATED_FULLY'],
     '/login*': ['IS_AUTHENTICATED_ANONYMOUSLY'],
     '/login/**': ['IS_AUTHENTICATED_ANONYMOUSLY'],