diff --git a/client-runtime/pom.xml b/client-runtime/pom.xml index 8c85fcbe..4aaca55b 100644 --- a/client-runtime/pom.xml +++ b/client-runtime/pom.xml @@ -1,40 +1,40 @@ - - - 4.0.0 - - stjs - org.st-js - 3.3.1-SNAPSHOT - - - client-runtime - - Strongly-typed Javascript:Client Runtime webjar - - - 1.0.0 - - - - - - com.dasberg.maven.plugins - maven-closure-compiler-plugin - ${maven-closure-compiler-plugin.version} - - - prepare-package - - compile - - - src/main/resources/META-INF/resources/webjars/stjs-client-runtime - ${project.build.outputDirectory}/META-INF/resources/webjars/stjs-client-runtime - min - - - - - - - + + + 4.0.0 + + stjs + org.st-js + 3.3.3-SNAPSHOT + + + client-runtime + + Strongly-typed Javascript:Client Runtime webjar + + + 1.0.0 + + + + + + com.dasberg.maven.plugins + maven-closure-compiler-plugin + ${maven-closure-compiler-plugin.version} + + + prepare-package + + compile + + + src/main/resources/META-INF/resources/webjars/stjs-client-runtime + ${project.build.outputDirectory}/META-INF/resources/webjars/stjs-client-runtime + min + + + + + + + diff --git a/client-runtime/src/main/resources/META-INF/resources/webjars/stjs-client-runtime/stjs.js b/client-runtime/src/main/resources/META-INF/resources/webjars/stjs-client-runtime/stjs.js index 46eba259..cb075eb6 100644 --- a/client-runtime/src/main/resources/META-INF/resources/webjars/stjs-client-runtime/stjs.js +++ b/client-runtime/src/main/resources/META-INF/resources/webjars/stjs-client-runtime/stjs.js @@ -831,9 +831,13 @@ stjs.typefy=function(obj, cls){ continue; } if (typeof prop == "string") - ret[key] = convert(td, prop); - else if (typeof prop == "object") - ret[key] = stjs.typefy(prop, td); + ret[key] = convert(td, prop); + else if (typeof prop == "object") { + if (typeof td == "string") { + td = eval(td); + } + ret[key] = stjs.typefy(prop, td); + } } return ret; }; diff --git a/code-analysis/pom.xml b/code-analysis/pom.xml index 6c6fa5b2..3caad99e 100644 --- a/code-analysis/pom.xml +++ b/code-analysis/pom.xml @@ -1,29 +1,29 @@ - - 4.0.0 - org.st-js - code-analysis - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - 1.0-beta-2 - - - - - - org.apache.maven.wagon - wagon-webdav - ${wagon-webdav.version} - - - - - - + + 4.0.0 + org.st-js + code-analysis + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + 1.0-beta-2 + + + + + + org.apache.maven.wagon + wagon-webdav + ${wagon-webdav.version} + + + + + + \ No newline at end of file diff --git a/command-line/pom.xml b/command-line/pom.xml index 4e0c506a..da0db8df 100644 --- a/command-line/pom.xml +++ b/command-line/pom.xml @@ -1,152 +1,152 @@ - - - 4.0.0 - - st-js-command-line - jar - Strongly-typed Javascript:Command Line Generator - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - - - - - - - - org.st-js - generator - ${project.version} - - - - - - jgrapht - jgrapht - 0.7.3 - - - - junit - junit - 4.8.1 - test - - - - - - - org.codehaus.mojo - appassembler-maven-plugin - 1.5 - - etc - lib - flat - true - - - org.stjs.command.line.ProjectCommandLine - st-js - - - - - - package - - assemble - - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.2 - - - package - - replace - - - - - ${project.basedir} - - target/appassembler/bin/* - - - - set CLASSPATH= - set CLASSPATH="%JAVA_HOME%"\\lib\\tools.jar; - - - CLASSPATH=\$CLASSPATH_PREFIX - CLASSPATH=\$CLASSPATH_PREFIX:"\$JAVA_HOME"/lib/tools.jar - - - - - - - maven-assembly-plugin - 2.4 - - - assembly.xml - - - - - make-assembly - package - - single - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - - **/*IntegrationTest.java - - - - - integration-test - - test - - integration-test - - - none - - - **/*IntegrationTest.java - - - - - - - - + + + 4.0.0 + + st-js-command-line + jar + Strongly-typed Javascript:Command Line Generator + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + + + + + + + + org.st-js + generator + ${project.version} + + + + + + jgrapht + jgrapht + 0.7.3 + + + + junit + junit + 4.8.1 + test + + + + + + + org.codehaus.mojo + appassembler-maven-plugin + 1.5 + + etc + lib + flat + true + + + org.stjs.command.line.ProjectCommandLine + st-js + + + + + + package + + assemble + + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + package + + replace + + + + + ${project.basedir} + + target/appassembler/bin/* + + + + set CLASSPATH= + set CLASSPATH="%JAVA_HOME%"\\lib\\tools.jar; + + + CLASSPATH=\$CLASSPATH_PREFIX + CLASSPATH=\$CLASSPATH_PREFIX:"\$JAVA_HOME"/lib/tools.jar + + + + + + + maven-assembly-plugin + 2.4 + + + assembly.xml + + + + + make-assembly + package + + single + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7.2 + + + **/*IntegrationTest.java + + + + + integration-test + + test + + integration-test + + + none + + + **/*IntegrationTest.java + + + + + + + + diff --git a/generator-plugin-java8/pom.xml b/generator-plugin-java8/pom.xml index 19032a50..16ccefcb 100644 --- a/generator-plugin-java8/pom.xml +++ b/generator-plugin-java8/pom.xml @@ -1,91 +1,91 @@ - - - 4.0.0 - - stjs-generator-plugin-java8 - jar - Strongly-typed Javascript:Generator Plugin for Java8 features - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - - - - org.st-js - generator - ${project.version} - - - - com.sun - tools - 1.8.0 - system - ${env.JAVA8_HOME}/lib/tools.jar - - - - - junit - junit - 4.8.1 - test - - - - - org.st-js.bridge - html - 4.01.0 - test - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 2.3.2 - - true - true - 1.8 - 1.8 - ${env.JAVA8_HOME}/bin/javac - 1.8 - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - ${env.JAVA8_HOME}/bin/java - once - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - ${env.JAVA8_HOME}/bin/javadoc - - - - - - - + + + 4.0.0 + + stjs-generator-plugin-java8 + jar + Strongly-typed Javascript:Generator Plugin for Java8 features + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + + + + org.st-js + generator + ${project.version} + + + + com.sun + tools + 1.8.0 + system + ${env.JAVA8_HOME}/lib/tools.jar + + + + + junit + junit + 4.8.1 + test + + + + + org.st-js.bridge + html + 4.01.0 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 2.3.2 + + true + true + 1.8 + 1.8 + ${env.JAVA8_HOME}/bin/javac + 1.8 + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7.2 + + ${env.JAVA8_HOME}/bin/java + once + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + ${env.JAVA8_HOME}/bin/javadoc + + + + + + + diff --git a/generator/pom.xml b/generator/pom.xml index 3b5681b9..a38efb17 100644 --- a/generator/pom.xml +++ b/generator/pom.xml @@ -1,92 +1,92 @@ - - - 4.0.0 - - generator - jar - Strongly-typed Javascript:Generator - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - - - - org.st-js - shared - ${project.version} - - - - - com.sun - tools - 1.7.0 - system - ${java.home}/../lib/tools.jar - - - - - com.google.guava - guava - 18.0 - - - - com.google.javascript - closure-compiler - v20141215 - - - - - - - - - - - - junit - junit - 4.8.1 - true - - - - - - org.st-js - server - ${project.version} - test - - - - - - - org.mozilla - rhino - 1.7R4 - - - - - com.google.code.findbugs - annotations - 2.0.0 - - - - - - + + + 4.0.0 + + generator + jar + Strongly-typed Javascript:Generator + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + + + + org.st-js + shared + ${project.version} + + + + + com.sun + tools + 1.7.0 + system + ${java.home}/../lib/tools.jar + + + + + com.google.guava + guava + 18.0 + + + + com.google.javascript + closure-compiler + v20141215 + + + + + + + + + + + + junit + junit + 4.8.1 + true + + + + + + org.st-js + server + ${project.version} + test + + + + + + + org.mozilla + rhino + 1.7R4 + + + + + com.google.code.findbugs + annotations + 2.0.0 + + + + + + \ No newline at end of file diff --git a/maven-plugin-it/pom.xml b/maven-plugin-it/pom.xml index e4b786dd..b280fbc3 100644 --- a/maven-plugin-it/pom.xml +++ b/maven-plugin-it/pom.xml @@ -1,48 +1,48 @@ - - - 4.0.0 - - stjs - org.st-js - 3.3.1-SNAPSHOT - - - maven-plugin-it - - Strongly-typed Javascript:Maven plugin integration test - - - - org.apache.maven.shared - maven-verifier - 1.2 - - - - junit - junit - 4.8.1 - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - ${project.version} - - - - - /pack*/** - - - - - - - + + + 4.0.0 + + stjs + org.st-js + 3.3.3-SNAPSHOT + + + maven-plugin-it + + Strongly-typed Javascript:Maven plugin integration test + + + + org.apache.maven.shared + maven-verifier + 1.2 + + + + junit + junit + 4.8.1 + test + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.16 + + + ${project.version} + + + + + /pack*/** + + + + + + + diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 5d9e0743..2083c600 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -1,85 +1,85 @@ - - - 4.0.0 - - stjs-maven-plugin - maven-plugin - Strongly-typed Javascript:Maven Plugin - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - - - - - - - - org.st-js - generator - ${project.version} - - - org.st-js - stjs-generator-plugin-java8 - ${project.version} - runtime - - - org.apache.maven - maven-plugin-api - 3.2.1 - - - org.apache.maven - maven-core - 3.2.1 - - - - org.codehaus.plexus - plexus-utils - 1.5.8 - - - org.codehaus.plexus - plexus-compiler-api - 1.8.2 - - - org.codehaus.plexus - plexus-component-api - - - - - org.sonatype.plexus - plexus-build-api - 0.0.7 - - - jgrapht - jgrapht - 0.7.3 - - - - - - - - - org.codehaus.plexus - plexus-utils - 1.5.8 - - - - + + + 4.0.0 + + stjs-maven-plugin + maven-plugin + Strongly-typed Javascript:Maven Plugin + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + + + + + + + + org.st-js + generator + ${project.version} + + + org.st-js + stjs-generator-plugin-java8 + ${project.version} + runtime + + + org.apache.maven + maven-plugin-api + 3.2.1 + + + org.apache.maven + maven-core + 3.2.1 + + + + org.codehaus.plexus + plexus-utils + 1.5.8 + + + org.codehaus.plexus + plexus-compiler-api + 1.8.2 + + + org.codehaus.plexus + plexus-component-api + + + + + org.sonatype.plexus + plexus-build-api + 0.0.7 + + + jgrapht + jgrapht + 0.7.3 + + + + + + + + + org.codehaus.plexus + plexus-utils + 1.5.8 + + + + diff --git a/pom.xml b/pom.xml index 736bbf16..c5febf82 100644 --- a/pom.xml +++ b/pom.xml @@ -1,227 +1,242 @@ - - - - 4.0.0 - org.st-js - stjs - 3.3.1-SNAPSHOT - pom - Strongly-typed Javascript - Javascript code generator from Java source code - http://www.st-js.org - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - acraciun - Alexandru Craciun - ax.craciun@gmail.com - - - - ekaspi - Eyal Kaspi - eyal.kaspi@gmail.com - - - - - org.sonatype.oss - oss-parent - 7 - - - - code-analysis - client-runtime - generator - generator-plugin-java8 - shared - server - maven-plugin - test-helper - maven-plugin-it - command-line - - - - UTF-8 - - - 1.0-beta-2 - 1.0-beta-6 - 1.1 - 1.1 - - - 3.0.1 - - 3.0.1 - 2.10 - false - 5.0.4 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.7 - 1.7 - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - jar - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.1 - - clean install - true - - - - - - - - - - code-analysis - - - .code-analysis.enabled - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${findbugs-maven-plugin.version} - - Max - Low - code-analysis/findbugs.xml - ${findbugs.fork} - false - - - - - check - - - - - - org.st-js - code-analysis - ${project.version} - - - - - - org.apache.maven.plugins - maven-pmd-plugin - ${maven-pmd-plugin.version} - - - false - true - - /code-analysis/pmd.xml - - 3 - false - - - - - check - - - - - - org.st-js - code-analysis - ${project.version} - - - - net.sourceforge.pmd - pmd - ${pmd.version} - - - - com.ibm.icu - icu4j - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - /code-analysis/checkstyle.xml - true - false - - - - - check - - - - - - org.st-js - code-analysis - ${project.version} - - - - - - - - - - scm:git:https://github.com/st-js/st-js.git - scm:git:https://github.com/st-js/st-js.git - scm:git:https://github.com/st-js/st-js - HEAD - - + + + + 4.0.0 + org.st-js + stjs + 3.3.3-SNAPSHOT + pom + Strongly-typed Javascript + Javascript code generator from Java source code + http://www.st-js.org + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + acraciun + Alexandru Craciun + ax.craciun@gmail.com + + + + ekaspi + Eyal Kaspi + eyal.kaspi@gmail.com + + + + + org.sonatype.oss + oss-parent + 7 + + + + code-analysis + client-runtime + generator + generator-plugin-java8 + shared + server + maven-plugin + test-helper + maven-plugin-it + command-line + + + + UTF-8 + + + 1.0-beta-2 + 1.0-beta-6 + 1.1 + 1.1 + + + 3.0.1 + + 3.0.1 + 2.10 + false + 5.0.4 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.7 + 1.7 + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.5.1 + + clean install + true + + + + + + + + + + code-analysis + + + .code-analysis.enabled + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + ${findbugs-maven-plugin.version} + + Max + Low + code-analysis/findbugs.xml + ${findbugs.fork} + false + + + + + check + + + + + + org.st-js + code-analysis + ${project.version} + + + + + + org.apache.maven.plugins + maven-pmd-plugin + ${maven-pmd-plugin.version} + + + false + true + + /code-analysis/pmd.xml + + 3 + false + + + + + check + + + + + + org.st-js + code-analysis + ${project.version} + + + + net.sourceforge.pmd + pmd + ${pmd.version} + + + + com.ibm.icu + icu4j + + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + /code-analysis/checkstyle.xml + true + false + + + + + check + + + + + + org.st-js + code-analysis + ${project.version} + + + + + + + + + + scm:git:https://github.com/st-js/st-js.git + scm:git:https://github.com/st-js/st-js.git + scm:git:https://github.com/st-js/st-js + HEAD + + diff --git a/server/pom.xml b/server/pom.xml index 3b40090d..116cac09 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -1,55 +1,55 @@ - - - 4.0.0 - - server - jar - Strongly-typed Javascript:Server-side Library - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - - - org.st-js - shared - ${project.version} - - - - com.google.code.gson - gson - 1.7.1 - true - - - - - junit - junit - 4.8.1 - test - - - - org.codehaus.jackson - jackson-core-asl - 1.8.5 - true - - - org.codehaus.jackson - jackson-mapper-asl - 1.8.5 - true - - - - + + + 4.0.0 + + server + jar + Strongly-typed Javascript:Server-side Library + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + + + org.st-js + shared + ${project.version} + + + + com.google.code.gson + gson + 1.7.1 + true + + + + + junit + junit + 4.8.1 + test + + + + org.codehaus.jackson + jackson-core-asl + 1.8.5 + true + + + org.codehaus.jackson + jackson-mapper-asl + 1.8.5 + true + + + + \ No newline at end of file diff --git a/shared/pom.xml b/shared/pom.xml index 8d281030..dcc59cc4 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -1,34 +1,34 @@ - - - 4.0.0 - - shared - jar - Strongly-typed Javascript:Client-Server Shared Library - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - - - org.st-js - client-runtime - ${project.version} - - - - junit - junit - 4.8.1 - test - - - - - + + + 4.0.0 + + shared + jar + Strongly-typed Javascript:Client-Server Shared Library + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + + + org.st-js + client-runtime + ${project.version} + + + + junit + junit + 4.8.1 + test + + + + + diff --git a/test-helper/pom.xml b/test-helper/pom.xml index 1486d80e..07c69768 100644 --- a/test-helper/pom.xml +++ b/test-helper/pom.xml @@ -1,72 +1,72 @@ - - - 4.0.0 - - test-helper - jar - Strongly-typed Javascript:Test Helper - - - org.st-js - stjs - 3.3.1-SNAPSHOT - - - - - - src/test/java - - - - - - - jstd-maven-plugin google code repo - http://jstd-maven-plugin.googlecode.com/svn/maven2 - - - - - - - - - org.st-js - generator - ${project.version} - - - - junit - junit - 4.8.1 - - - - org.mozilla - rhino - 1.7R4 - - - - org.webjars - webjars-locator-core - 0.30 - - - - org.seleniumhq.selenium - selenium-remote-driver - 2.21.0 - - - - org.mockito - mockito-core - 1.10.19 - - - - + + + 4.0.0 + + test-helper + jar + Strongly-typed Javascript:Test Helper + + + org.st-js + stjs + 3.3.3-SNAPSHOT + + + + + + src/test/java + + + + + + + jstd-maven-plugin google code repo + http://jstd-maven-plugin.googlecode.com/svn/maven2 + + + + + + + + + org.st-js + generator + ${project.version} + + + + junit + junit + 4.8.1 + + + + org.mozilla + rhino + 1.7R4 + + + + org.webjars + webjars-locator-core + 0.30 + + + + org.seleniumhq.selenium + selenium-remote-driver + 2.21.0 + + + + org.mockito + mockito-core + 1.10.19 + + + + \ No newline at end of file diff --git a/test-helper/src/main/resources/start.html b/test-helper/src/main/resources/start.html index 534b42d8..da01235e 100644 --- a/test-helper/src/main/resources/start.html +++ b/test-helper/src/main/resources/start.html @@ -1,5 +1,9 @@ + + + +