Merge branch 'feature/parcel' into develop

archetype/pom.xml

@@ -5,7 +5,7 @@
   <parent>
       <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>java2ts-processor-archetype</artifactId>
   <name>java2ts-processor::archetype - ${project.version}</name>

core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>java2ts-processor-core</artifactId>
   <name>java2ts-processor::core - ${project.version}</name>

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>java2ts-processor::parent - ${project.version}</name>

processor/pom.xml

@@ -7,7 +7,7 @@
     <parent>
 	    <groupId>org.bsc.processor</groupId>
 	    <artifactId>java2ts-processor-parent</artifactId>
-	    <version>1.1.0</version>    
+	    <version>1.2.0-SNAPSHOT</version>    
     </parent>
 
     <build>

samples/.gitignore

@@ -1,2 +1,4 @@
 node_modules/
-/.apt_generated/
+.apt_generated/
+.apt_generated_tests/
+.cache/

samples/app.js

@@ -23,6 +23,5 @@ var process = { argv:$ARG, env:{TERM:'color'} } ;
 var exports = {};
 
 var FILE2RUN='main.js'
-FILE2RUN='marked.test.js'
 
 load('target/ts/src/main/ts/' + FILE2RUN);

samples/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.bsc.processor</groupId>
     <artifactId>java2ts-processor-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -131,7 +131,7 @@
 							</goals>
 							<phase>generate-sources</phase>
 							<configuration>
-								<outputDirectory>${project.build.directory}</outputDirectory>
+ 								<outputDirectory>src/main/ts</outputDirectory>
 								<options>
 									<ts.outfile>jdk8</ts.outfile>
 								</options>
@@ -151,7 +151,7 @@
 												<argument>-classpath</argument>
 												<classpath />
 												<argument>org.bsc.java2ts.JSRun$Nashorn</argument>
-												<argument>app.js</argument>
+												<argument>${project.build.directory}/js/main.js</argument>
 										</arguments>
 								</configuration>
 						</execution>

samples/src/main/ts/color.test.ts

@@ -3,7 +3,7 @@ import * as colors from "colors/safe";
 import {
     Stream, 
     Arrays, 
-  } from "ts/jdk8-types";
+  } from "./ts/jdk8-types";
 
 
 export function test() {

samples/src/main/ts/future.test.rhino.ts

@@ -3,7 +3,7 @@ import {
     Executor,
     Optional,
     RuntimeException
-} from "ts/jdk8-types";
+} from "./ts/jdk8-types";
 
 function doSometing() {
     return CompletableFuture.completedFuture("DONE!");

samples/src/main/ts/future.test.ts

@@ -3,7 +3,7 @@ import {
     Executor,
     Optional,
     RuntimeException
-} from "ts/jdk8-types";
+} from './ts/jdk8-types';
 
 function doSometing() {
     return CompletableFuture.completedFuture("DONE!");

samples/src/main/ts/main.rhino.ts

@@ -5,7 +5,7 @@ import {
   URI, 
   Optional,
   MemoryType,
-} from "ts/jdk8-types";
+} from "./ts/jdk8-types";
 
 
 const u1 = "http://localhost:8000/site/";

samples/src/main/ts/main.ts

@@ -1,6 +1,8 @@
 
-import { MemoryType, Optional, URI } from "ts/jdk8-types";
-import { test as future_test } from "./future.test";
+import { MemoryType, Optional, URI } from './ts/jdk8-types';
+
+import { test as future_test } from './future.test';
+import { test as marked_test } from './marked.test';
 
 
 
@@ -30,4 +32,6 @@ mustache_test();
 validator_test();
 stream_test();
 */
-future_test();
+future_test();
+
+marked_test();

samples/src/main/ts/marked.test.ts

@@ -97,7 +97,9 @@ export function markdown2wiki(md:string) {
 }
 
 
-let res = markdown2wiki( '# TEST' );
+export function test() {
+    let res = markdown2wiki( '# TEST' );
 
-print( res );
+    print( res );    
+}