Skip to content

Commit

Permalink
Merge remote-tracking branch 'st-js/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
zhuker committed Aug 31, 2016
2 parents b775b13 + 198c957 commit 9fe242a
Show file tree
Hide file tree
Showing 13 changed files with 947 additions and 924 deletions.
80 changes: 40 additions & 40 deletions client-runtime/pom.xml
@@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>stjs</artifactId>
<groupId>org.st-js</groupId>
<version>3.3.1-SNAPSHOT</version>
</parent>

<artifactId>client-runtime</artifactId>

<name>Strongly-typed Javascript:Client Runtime webjar</name>

<properties>
<maven-closure-compiler-plugin.version>1.0.0</maven-closure-compiler-plugin.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.dasberg.maven.plugins</groupId>
<artifactId>maven-closure-compiler-plugin</artifactId>
<version>${maven-closure-compiler-plugin.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<js_dir>src/main/resources/META-INF/resources/webjars/stjs-client-runtime</js_dir>
<js_output_dir>${project.build.outputDirectory}/META-INF/resources/webjars/stjs-client-runtime</js_output_dir>
<version>min</version>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>stjs</artifactId>
<groupId>org.st-js</groupId>
<version>3.3.3-SNAPSHOT</version>
</parent>

<artifactId>client-runtime</artifactId>

<name>Strongly-typed Javascript:Client Runtime webjar</name>

<properties>
<maven-closure-compiler-plugin.version>1.0.0</maven-closure-compiler-plugin.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>com.dasberg.maven.plugins</groupId>
<artifactId>maven-closure-compiler-plugin</artifactId>
<version>${maven-closure-compiler-plugin.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<js_dir>src/main/resources/META-INF/resources/webjars/stjs-client-runtime</js_dir>
<js_output_dir>${project.build.outputDirectory}/META-INF/resources/webjars/stjs-client-runtime</js_output_dir>
<version>min</version>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Expand Up @@ -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;
};
Expand Down
56 changes: 28 additions & 28 deletions code-analysis/pom.xml
@@ -1,29 +1,29 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.st-js</groupId>
<artifactId>code-analysis</artifactId>

<parent>
<groupId>org.st-js</groupId>
<artifactId>stjs</artifactId>
<version>3.3.1-SNAPSHOT</version>
</parent>

<properties>
<!-- Maven extensions versions -->
<wagon-webdav.version>1.0-beta-2</wagon-webdav.version>
</properties>
<build>
<extensions>
<!-- Default extension for deploying the Artifacts -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>${wagon-webdav.version}</version>
</extension>
</extensions>

</build>


<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.st-js</groupId>
<artifactId>code-analysis</artifactId>

<parent>
<groupId>org.st-js</groupId>
<artifactId>stjs</artifactId>
<version>3.3.3-SNAPSHOT</version>
</parent>

<properties>
<!-- Maven extensions versions -->
<wagon-webdav.version>1.0-beta-2</wagon-webdav.version>
</properties>
<build>
<extensions>
<!-- Default extension for deploying the Artifacts -->
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
<version>${wagon-webdav.version}</version>
</extension>
</extensions>

</build>


</project>

0 comments on commit 9fe242a

Please sign in to comment.