Changeset 920 for branches


Ignore:
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:
17 edited

Legend:

Unmodified
Added
Removed

  • branches/features/purchaseOrders

  • branches/features/purchaseOrders/application.properties

    r901 r920  
    66app.vcsRevision=$Rev$
    77app.version=
    8 plugins.acegi=0.5.3
    9 plugins.class-diagram=0.5.2
    10 plugins.export=0.7
    11 plugins.filterpane=0.7
    12 plugins.help-balloons=1.4
    138plugins.hibernate=1.3.7
    14 plugins.jasper=1.1.3
    15 plugins.navigation=1.1.1
    16 plugins.quartz=0.4.2
    17 plugins.richui=0.8
    18 plugins.searchable=0.6-SNAPSHOT
    199plugins.tomcat=1.3.7

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

    r901 r920  
    1919
    2020grails.war.resources = { stagingDir, args ->
    21     // Remove some duplicate jars.
    22     delete file: "${stagingDir}/WEB-INF/lib/jasperreports-2.0.5.jar"
    23     delete file: "${stagingDir}/WEB-INF/lib/jasperreports-3.1.2.jar"
    24     delete file: "${stagingDir}/WEB-INF/lib/aspectjrt-1.5.4.jar"
    25     delete file: "${stagingDir}/WEB-INF/lib/commons-digester-1.7.jar"
    26     delete file: "${stagingDir}/WEB-INF/lib/iText-2.0.8.jar"
     21    // Remove some duplicate/not required jars.
     22    // From export plugin lib dir.
    2723    delete file: "${stagingDir}/WEB-INF/lib/iText-2.1.5.jar"
    28     delete file: "${stagingDir}/WEB-INF/lib/jfreechart-1.0.3.jar"
    29     delete file: "${stagingDir}/WEB-INF/lib/poi-3.0.2-FINAL-20080204.jar"
    30     delete file: "${stagingDir}/WEB-INF/lib/facebook-2.0.4.jar"
     24    // From acegi plugin lib dir.
     25    delete file: "${stagingDir}/WEB-INF/lib/facebook-java-api-2.0.4.jar"
     26    delete file: "${stagingDir}/WEB-INF/lib/easymock.jar"
     27    delete file: "${stagingDir}/WEB-INF/lib/cas-client-core-3.1.1.jar"
     28    delete file: "${stagingDir}/WEB-INF/lib/openid4java-0.9.2.jar"
     29
    3130}
    3231
    … …  
    5756    }
    5857
     58    plugins {
     59        runtime ':acegi:0.5.3'
     60        runtime ':export:0.7'
     61        runtime ':filterpane:0.7'
     62        runtime ':help-balloons:1.4'
     63        runtime(':jasper:1.1.3') {
     64            transitive = false
     65        }
     66        runtime ':navigation:1.1.1'
     67        runtime ':quartz:0.4.2'
     68        runtime ':richui:0.8'
     69        runtime ':searchable:0.6-SNAPSHOT'
     70
     71        test ':geb:0.6-SNAPSHOT'
     72        test ':spock:0.5-groovy-1.7'
     73    }
     74
    5975    dependencies {
    6076        // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes eg.
    … …  
    6278        runtime 'mysql:mysql-connector-java:5.1.9'
    6379
     80        // Japser plugin.
     81        runtime('net.sf.jasperreports:jasperreports:3.7.2') {
     82            excludes 'antlr', 'commons-beanutils', 'commons-collections', 'commons-logging',
     83                    'ant', 'mondrian', 'commons-javaflow','barbecue', 'xml-apis-ext','xml-apis', 'xalan', 'groovy-all', 'hibernate', 'saaj-api', 'servlet-api',
     84                    'xercesImpl','xmlParserAPIs','spring-core','bsh', 'spring-beans', 'jaxen', 'barcode4j','batik-svg-dom','batik-xml','batik-awt-util','batik-dom',
     85                    'batik-css','batik-gvt','batik-script', 'batik-svggen','batik-util','batik-bridge','persistence-api','jdtcore','bcmail-jdk14','bcprov-jdk14','bctsp-jdk14'
     86        }
    6487        runtime('org.apache.poi:poi:3.5-FINAL') {
    65             excludes 'servlet-api', 'commons-logging', 'log4j'
     88            excludes 'log4j', 'commons-logging'
    6689        }
    6790
    68         runtime('net.sf.jasperreports:jasperreports:3.7.2') {
    69             excludes 'xml-apis'
    70         }
    71 
     91        // Origin unknown, still required?
    7292        runtime('org.apache.ant:ant:1.7.1')
    7393        runtime('org.apache.ant:ant-launcher:1.7.1')
    7494
    75         test("org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release") {
     95        test('org.seleniumhq.selenium:selenium-htmlunit-driver:latest.release') {
    7696            excludes 'xml-apis'
    7797        }
    7898    }
    79     plugins {
    80         test ":geb:0.6-SNAPSHOT"
    81         test ":spock:0.5-groovy-1.7"
    82     }
    8399
    84100}

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

    r532 r920  
    4444    '/plugins/*/css/**': ['IS_AUTHENTICATED_ANONYMOUSLY'],
    4545    '/plugins/*/js/**': ['IS_AUTHENTICATED_ANONYMOUSLY'],
    46     '/classDiagram*': ['IS_AUTHENTICATED_FULLY'],
    47     '/classDiagram/**': ['IS_AUTHENTICATED_FULLY'],
    4846    '/login*': ['IS_AUTHENTICATED_ANONYMOUSLY'],
    4947    '/login/**': ['IS_AUTHENTICATED_ANONYMOUSLY'],

  • branches/features/purchaseOrders/grails-app/controllers/AppCoreController.groovy

    r707 r920  
    5858
    5959        // Build the plugins string.
    60         def pluginProperties = grailsApplication.metadata.findAll {it.key.contains('plugin')}
    61         pluginProperties.each() {
    62             it.key = WordUtils.capitalize( (it.key + GString.EMPTY).split("\\.")[-1] )
    63         }
    64         pluginProperties = pluginProperties.sort { p1, p2 -> p1.key.compareToIgnoreCase(p2.key) }
    65         def plugins = pluginProperties.collect{ it.key + '-' + it.value }.join(", ")
     60        def userPlugins = org.codehaus.groovy.grails.plugins.PluginManagerHolder.pluginManager.userPlugins
     61
     62        userPlugins = userPlugins.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }
     63
     64        def plugins = userPlugins.collect{
     65            WordUtils.capitalize(it.name) + '-' + it.version
     66        }.join(", ")
    6667
    6768        def sections = Section.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }

  • branches/features/purchaseOrders/grails-app/controllers/AssetDetailedController.groovy

    r885 r920  
    164164        if(params?.format && params.format != "html") {
    165165
    166             def dateFmt = { date ->
    167                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     166            def dateFmt = { domain, value ->
     167                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    168168            }
    169169
    170 //             def fmtAsset = { m ->
     170//             def fmtAsset = { d, m ->
    171171//                     def r = ''
    172172//                     def assetInstance = Asset.findByName(m)
    … …  
    184184//             }
    185185
    186 //             def fmtSubAsset = { m ->
     186//             def fmtSubAsset = { d, m ->
    187187//                     def r = ''
    188188//                     m.each() {

  • branches/features/purchaseOrders/grails-app/controllers/AssetSubItemDetailedController.groovy

    r658 r920  
    6060        if(params?.format && params.format != "html") {
    6161
    62             def dateFmt = { date ->
    63                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     62            def dateFmt = { domain, value ->
     63                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    6464            }
    6565

  • branches/features/purchaseOrders/grails-app/controllers/InventoryItemDetailedController.groovy

    r727 r920  
    292292        if(params?.format && params.format != "html") {
    293293
    294             def dateFmt = { date ->
    295                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     294            def dateFmt = { domain, value ->
     295                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    296296            }
    297297
    … …  
    646646        if(params?.format && params.format != "html") {
    647647
    648             def dateFmt = { date ->
    649                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     648            def dateFmt = { domain, value ->
     649                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    650650            }
    651651

  • branches/features/purchaseOrders/grails-app/controllers/InventoryItemPurchaseDetailedController.groovy

    r893 r920  
    143143        if(params?.format && params.format != "html") {
    144144
    145             def dateFmt = { date ->
    146                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     145            def dateFmt = { domain, value ->
     146                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    147147            }
    148148

  • branches/features/purchaseOrders/grails-app/controllers/TaskDetailedController.groovy

    r871 r920  
    147147        if(params?.format && params.format != "html") {
    148148
    149             def dateFmt = { date ->
    150                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     149            def dateFmt = { domain, value ->
     150                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    151151            }
    152152
    … …  
    308308        if(params?.format && params.format != "html") {
    309309
    310             def dateFmt = { date ->
    311                 formatDate(format: "EEE, dd-MMM-yyyy", date: date)
     310            def dateFmt = { domain, value ->
     311                formatDate(format: "EEE, dd-MMM-yyyy", date: value)
    312312            }
    313313

  • branches/features/purchaseOrders/grails-app/domain/InventoryItem.groovy

    r892 r920  
    1313    BigDecimal estimatedUnitPriceAmount
    1414    Currency estimatedUnitPriceCurrency
    15     String suppliersPartNumber
     15    String suppliersPartNumber = ""
    1616    Integer unitsInStock = 0
    1717    Integer reorderPoint = 0
    … …  
    2626
    2727    static hasMany = [spareFor: Asset,
    28                                     inventoryMovements: InventoryMovement,
    29                                     alternateSuppliers: Supplier]
     28                        inventoryMovements: InventoryMovement,
     29                        alternateSuppliers: Supplier]
    3030
    3131//     static belongsTo = []
    … …  
    4848        estimatedUnitPriceAmount(nullable:true, max: new BigDecimal(1000000000000))
    4949        estimatedUnitPriceCurrency(nullable:true)
    50         suppliersPartNumber(blank:true, nullable:true, maxSize:50)
     50        suppliersPartNumber(blank:true, maxSize:50)
    5151        preferredSupplier(nullable:true)
    5252    }

  • branches/features/purchaseOrders/grails-app/services/AssetTreeService.groovy

    r800 r920  
    111111
    112112        def sw = new StringWriter()
    113         def mkp = new groovy.xml.MarkupBuilder(sw)
    114 
    115         mkp.div(class: buttonHtmlClass) {
     113        def mb = new groovy.xml.MarkupBuilder(sw)
     114
     115        mb.div(class: buttonHtmlClass) {
    116116            a( href: hrefShowPane() ) {
    117117                img(src: treeRootImg, alt: 'Asset Tree', title: 'Asset Tree')
    118118            }
    119         } // mkp
     119        }
    120120
    121121        return sw.toString()
    … …  
    133133
    134134        def sw = new StringWriter()
    135         def mkp = new groovy.xml.MarkupBuilder(sw)
    136 
    137         mkp.div(class: paneHtmlClass, id: paneHtmlId, style: 'display:none;') {
     135        def mb = new groovy.xml.MarkupBuilder(sw)
     136
     137        mb.div(class: paneHtmlClass, id: paneHtmlId, style: 'display:none;') {
    138138            div(class: paneCloseHtmlClass) {
    139139                a( href: js.toggle(paneHtmlId) ) {
    … …  
    155155                } // table
    156156            } // div
    157         } // mkp
     157        }
    158158
    159159        return sw.toString()
    … …  
    203203
    204204        def sw = new StringWriter()
    205         def mkp = new groovy.xml.MarkupBuilder(sw)
     205        def mb = new groovy.xml.MarkupBuilder(sw)
    206206
    207207        // Offer a site create link if no sites are found.
    208208        if(!sites) {
    209             mkp.div(class: tableDivHtmlClass) {
     209            mb.div(class: tableDivHtmlClass) {
    210210
    211211                div(class: paneCloseHtmlClass) {
    … …  
    235235                    }
    236236                } // button div
    237             } // mkp
     237            } // mb
    238238            return sw.toString()
    239239        } // if(!sites)
    … …  
    242242        // The main populated table.
    243243        /// @todo: use a loop for the subItem levels.
    244         mkp.div(class: tableDivHtmlClass) {
     244        mb.div(class: tableDivHtmlClass) {
    245245
    246246            div(class: paneCloseHtmlClass) {
    … …  
    443443            }
    444444
    445         } // mkp
     445        } // mb
    446446
    447447        def totalTime = (System.currentTimeMillis() - startedAt)/1000

  • branches/features/purchaseOrders/grails-app/taglib/CustomTagLib.groovy

    r829 r920  
    314314    */
    315315    def helpBalloon = {attrs, body ->
    316         def mkp = new groovy.xml.MarkupBuilder(out) //this line will be unnecessary in versions of Grails after version 1.2
     316        def mb = new groovy.xml.MarkupBuilder(out)
    317317
    318318        def title = attrs["title"]
    … …  
    352352        if(iconSrc) {
    353353            iconId = iconId ?: "customHb$num"
    354             mkp.img( id: iconId, src: iconSrc)
     354            mb.img(id: iconId, src: iconSrc)
    355355        }
    356356
    … …  
    367367});"""
    368368
    369         mkp.script(type: "text/javascript") {
    370             yieldUnescaped(javascript)
     369        mb.script(type: "text/javascript") {
     370            mkp.yieldUnescaped(javascript)
    371371        }
    372372

  • branches/features/purchaseOrders/grails-app/taglib/JsUtilTagLib.groovy

    r568 r920  
    2828    */
    2929    def toggleControl = { attrs ->
    30         def mkp = new groovy.xml.MarkupBuilder(out) //this line will be unnecessary in versions of Grails after version 1.2
     30        def mb = new groovy.xml.MarkupBuilder(out)
    3131
    3232        def toggleJs
    … …  
    3939
    4040        if(attrs.useDiv == 'false') {
    41             mkp.a( href: toggleJs ) {
    42                     yieldUnescaped(attrs.text)
     41            mb.a( href: toggleJs ) {
     42                    mkp.yieldUnescaped(attrs.text)
    4343                    img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
    44             } // mkp
     44            }
    4545
    4646        }
    4747        else {
    48             mkp.div() {
     48            mb.div() {
    4949                a( href: toggleJs ) {
    50                     yieldUnescaped(attrs.text)
     50                    mkp.yieldUnescaped(attrs.text)
    5151                    img(id: attrs.imageId, src: attrs.closedImgUrl, alt: "Show")
    5252                }
    53             } // mkp
     53            }
    5454        }
    5555

  • branches/features/purchaseOrders/grails-app/views/appCore/manager.gsp

    r746 r920  
    7272                        </tr>
    7373
    74                         <tr class="prop">
    75                             <td valign="top" class="name">
    76                                 <label>Entity Relationship Diagram:</label>
    77                             </td>
    78                             <td valign="top" class="value">
    79 
    80                                 <a href="${createLink(controller:'classDiagram', action:'model', params:[outputFormat: 'pdf', skin: 'classicSpaced', showMethods: 'false', autoUpdate: 'false'])}">PDF</a>
    81                                 <br />
    82                                 <a href="${createLink(controller:'classDiagram', action:'legend', target:'_blank')}">Legend</a>
    83                                 <br />
    84                                 <a href="${createLink(controller:'classDiagram', action:'show')}">Interactive.</a>
    85                             </td>
    86                         </tr>
    87 
    8874                    </tbody>
    8975                </table>

  • branches/features/purchaseOrders/scripts/_UpdateRev.groovy

    r531 r920  
    114114            return fail(code:"vcs.working.copy.not.found", args:[basedir])
    115115
    116     // Use svnkit to get the base revision.
     116    // Use svnkit to get the last committed revision.
    117117    def clientManager = SVNClientManager.newInstance()
    118118    def wcClient = clientManager.getWCClient()
    119119    try {
    120         result.revision = wcClient.doInfo(wc, SVNRevision.BASE).getRevision().toString()
     120        result.revision = wcClient.doInfo(wc, SVNRevision.BASE).getCommittedRevision().toString()
    121121    }
    122122    catch(org.tmatesoft.svn.core.SVNException e) {
Note: See TracChangeset for help on using the changeset viewer.