Changeset 1949


Ignore:
Timestamp:
2011-09-13 09:11:16 (8 months ago)
Author:
mpo
Message:

introducing new javascript checker and aggregator.
fixes #470

Location:
trunk/modules
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/modules/kauri-forms/kauri-forms-framework/pom.xml

    r1930 r1949  
    1111 
    1212  <artifactId>kauri-forms-framework</artifactId> 
    13   <packaging>javascript</packaging> 
     13  <packaging>jar</packaging> 
    1414  <name>KAURI ::: FORMS FRAMEWORK</name> 
    1515 
     
    2222 
    2323  <build> 
    24     <resources> 
    25       <resource> 
    26         <directory>src/main/kauri</directory> 
    27         <excludes> 
    28           <exclude>static-{build}.key/kauri.forms/assembler.xml</exclude> 
    29         </excludes> 
    30         <targetPath>KAURI-INF</targetPath> 
    31       </resource> 
    32     </resources> 
    33  
    3424    <plugins> 
    3525      <plugin> 
    3626        <groupId>org.apache.maven.plugins</groupId> 
    37         <artifactId>maven-antrun-plugin</artifactId> 
     27        <artifactId>maven-antrun-plugin</artifactId>  
    3828      </plugin> 
    39          
     29 
    4030      <plugin> 
    41         <groupId>org.codehaus.mojo.javascript</groupId> 
    42         <artifactId>javascript-maven-plugin</artifactId> 
    43         <extensions>true</extensions> 
    44         <configuration> 
    45           <sourceDirectory>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/</sourceDirectory> 
    46           <descriptor>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/assembler.xml</descriptor> 
    47           <strip>/* _DEV_ */</strip> 
    48         </configuration> 
    49         <!--  disabled compression for now: to investigate how to only compress the assembled js, not the sources useful for debugging   
     31        <groupId>net.alchim31.maven</groupId> 
     32        <artifactId>yuicompressor-maven-plugin</artifactId> 
    5033        <executions> 
    5134          <execution> 
    52             <id>compress</id> 
    53             <phase>process-resources</phase> 
    54             <configuration> 
    55               <classifier>compressed</classifier> 
    56             </configuration> 
    5735            <goals> 
    58               <goal>attach-compressed</goal> 
     36              <goal>jslint</goal> 
     37              <goal>compress</goal> 
    5938            </goals> 
    6039          </execution> 
    6140        </executions> 
    62         --> 
     41          <configuration> 
     42            <excludes> 
     43              <exclude>**/*.pack.js</exclude> 
     44              <exclude>**/*.css</exclude> 
     45              <exclude>**/static/**</exclude> 
     46              <exclude>**/target/**</exclude> 
     47            </excludes> 
     48            <nosuffix>true</nosuffix> 
     49            <aggregations> 
     50              <aggregation> 
     51                <insertNewLine>true</insertNewLine> 
     52                <output>${project.build.directory}/classes/KAURI-INF/static-{build}.key/kauri.forms/kauri.forms.js</output> 
     53                <includes> 
     54                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/HEADER</include> 
     55                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/registry.js</include> 
     56                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/validator.js</include> 
     57                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/formatter.js</include> 
     58                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/field.js</include> 
     59                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/control.js</include> 
     60                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/builder.js</include> 
     61                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/basic-validators.js</include> 
     62                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/basic-formatters.js</include> 
     63                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/basic-fields.js</include> 
     64                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/basic-controls.js</include> 
     65                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/collection.js</include> 
     66                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/composite.js</include> 
     67                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/case.js</include> 
     68                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/date.js</include> 
     69                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/numeric-range.js</include> 
     70                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/location.js</include> 
     71                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/upload.js</include> 
     72                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/form.js</include> 
     73                </includes> 
     74              </aggregation> 
     75            </aggregations> 
     76          </configuration> 
    6377      </plugin> 
    64  
    65       <!-- disabled since introduction of jquery 1.6.2  
    66            need to look for replacement js syntax checkup (possibly js-lint) 
    67            alternatives and work tracked in #470 
    68            http://dev.outerthought.org/trac/outerthought_kauri/ticket/470 
    69       <plugin> 
    70         <groupId>net.thefrontside.crosscheck.maven.plugin</groupId> 
    71         <artifactId>maven-crosscheck-plugin</artifactId> 
    72         <version>1.0-kauri-20080605</version> 
    73         <configuration> 
    74           <testDirectories> 
    75             <testDirectory>${basedir}/src/test/crosscheck/tests.js</testDirectory> 
    76           </testDirectories> 
    77           <browsers> 
    78             <browser>Mozilla18</browser> 
    79             <browser>InternetExplorer6</browser> 
    80           </browsers> 
    81         </configuration> 
    82         <executions> 
    83           <execution> 
    84             <phase>test</phase> 
    85             <goals> 
    86               <goal>jsunit</goal> 
    87             </goals> 
    88           </execution> 
    89         </executions> 
    90       </plugin> 
    91       --> 
    92  
    9378    </plugins> 
    9479  </build> 
    95  
    96   <reporting> 
    97     <plugins> 
    98       <plugin> 
    99         <groupId>org.codehaus.mojo.javascript</groupId> 
    100         <artifactId>javascript-report-maven-plugin</artifactId> 
    101         <configuration> 
    102           <sourceDirectory>${basedir}/src/main/kauri/static-{build}.key/kauri.forms/</sourceDirectory> 
    103           <includeUndocumented>true</includeUndocumented> 
    104         </configuration> 
    105         <reportSets> 
    106           <reportSet> 
    107             <reports> 
    108               <!-- include the desired reports --> 
    109               <!-- <report>jslint</report>--> 
    110               <report>jsdoc</report> 
    111             </reports> 
    112           </reportSet> 
    113         </reportSets> 
    114       </plugin> 
    115     </plugins> 
    116   </reporting> 
    11780</project> 
  • trunk/modules/kauri-forms/kauri-forms-jqgrid/pom.xml

    r1790 r1949  
    1010 
    1111  <artifactId>kauri-forms-jqgrid</artifactId> 
    12   <packaging>javascript</packaging> 
     12  <packaging>jar</packaging> 
    1313  <name>KAURI ::: FORMS JQUERY GRID</name> 
    1414 
     
    2323 
    2424  <build> 
    25     <plugins> 
    26       <plugin> 
    27         <groupId>org.codehaus.mojo.javascript</groupId> 
    28         <artifactId>javascript-maven-plugin</artifactId> 
    29         <extensions>true</extensions> 
    30         <configuration> 
    31           <sourceDirectory>src/main/kauri/static/jqgrid/jqgrid-3.4.3/js/</sourceDirectory> 
    32         </configuration> 
    33       </plugin> 
    34     </plugins> 
    3525  </build> 
    3626</project> 
  • trunk/modules/kauri-jquery/pom.xml

    r1790 r1949  
    1111 
    1212  <artifactId>kauri-jquery</artifactId> 
    13   <packaging>javascript</packaging> 
     13  <packaging>jar</packaging> 
    1414  <name>KAURI ::: JQUERY</name> 
    1515 
    1616  <build> 
    17     <resources> 
    18       <resource> 
    19         <directory>src/main/kauri</directory> 
    20         <excludes> 
    21           <exclude>static-{build}.key/kauri.util/assembler.xml</exclude> 
    22         </excludes> 
    23         <targetPath>KAURI-INF</targetPath> 
    24       </resource> 
    25     </resources> 
    26    
    2717    <plugins> 
    28      
    2918      <plugin> 
    3019        <groupId>org.apache.maven.plugins</groupId> 
    3120        <artifactId>maven-antrun-plugin</artifactId>  
    3221      </plugin> 
    33      
     22 
    3423      <plugin> 
    35         <groupId>org.codehaus.mojo.javascript</groupId> 
    36         <artifactId>javascript-maven-plugin</artifactId> 
    37         <extensions>true</extensions> 
    38         <configuration> 
    39           <sourceDirectory>${basedir}/src/main/kauri/static-{build}.key/kauri.util</sourceDirectory> 
    40           <descriptor>${basedir}/src/main/kauri/static-{build}.key/kauri.util/assembler.xml</descriptor> 
    41           <strip>/* _DEV_ */</strip> 
    42         </configuration> 
     24        <groupId>net.alchim31.maven</groupId> 
     25        <artifactId>yuicompressor-maven-plugin</artifactId> 
    4326        <executions> 
    44         <!-- 
    45         TODO CHECK maven js plugin 
    46         this beast starts minifying all js code  
    47         - should only be the own code  
    48    
    4927          <execution> 
    50             <id>compress</id> 
    51             <phase>process-resources</phase> 
    52             <configuration> 
    53               <classifier>compressed</classifier> 
    54             </configuration> 
    5528            <goals> 
    56               <goal>attach-compressed</goal> 
     29              <goal>jslint</goal> 
     30              <goal>compress</goal> 
    5731            </goals> 
    5832          </execution> 
    59         --> 
    6033        </executions> 
    61       </plugin>       
     34          <configuration> 
     35            <excludes> 
     36              <exclude>**/*.pack.js</exclude> 
     37              <exclude>**/*.css</exclude> 
     38              <exclude>**/static/**</exclude> 
     39              <exclude>**/target/**</exclude> 
     40            </excludes> 
     41            <nosuffix>true</nosuffix> 
     42            <aggregations> 
     43              <aggregation> 
     44                <insertNewLine>true</insertNewLine> 
     45                <output>${project.build.directory}/classes/KAURI-INF/static-{build}.key/kauri.util/kauri.util.js</output> 
     46                <includes> 
     47                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.util/HEADER</include> 
     48                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.util/core.js</include> 
     49                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.util/json2.js</include> 
     50                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.util/uritemplate.js</include> 
     51                  <include>${basedir}/src/main/kauri/static-{build}.key/kauri.util/locale.js</include> 
     52                </includes> 
     53              </aggregation> 
     54            </aggregations> 
     55          </configuration> 
     56      </plugin> 
     57     
    6258    </plugins> 
    6359  </build> 
Note: See TracChangeset for help on using the changeset viewer.