Removing references to bck2brwsr as in this form the project can't run in bck2brwsr mode
1.1 --- a/twitter/nbactions-bck2brwsr.xml Thu Jun 20 13:18:10 2013 +0200
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,35 +0,0 @@
1.4 -<?xml version="1.0" encoding="UTF-8"?>
1.5 -<!--
1.6 -
1.7 - The MIT License (MIT)
1.8 -
1.9 - Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
1.10 -
1.11 - Permission is hereby granted, free of charge, to any person obtaining a copy
1.12 - of this software and associated documentation files (the "Software"), to deal
1.13 - in the Software without restriction, including without limitation the rights
1.14 - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1.15 - copies of the Software, and to permit persons to whom the Software is
1.16 - furnished to do so, subject to the following conditions:
1.17 -
1.18 - The above copyright notice and this permission notice shall be included in
1.19 - all copies or substantial portions of the Software.
1.20 -
1.21 - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1.22 - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1.23 - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1.24 - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1.25 - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1.26 - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1.27 - THE SOFTWARE.
1.28 -
1.29 --->
1.30 -<actions>
1.31 - <action>
1.32 - <actionName>run</actionName>
1.33 - <goals>
1.34 - <goal>process-classes</goal>
1.35 - <goal>bck2brwsr:brwsr</goal>
1.36 - </goals>
1.37 - </action>
1.38 -</actions>
2.1 --- a/twitter/nbactions-fxbrwsr.xml Thu Jun 20 13:18:10 2013 +0200
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,45 +0,0 @@
2.4 -<?xml version="1.0" encoding="UTF-8"?>
2.5 -<!--
2.6 -
2.7 - The MIT License (MIT)
2.8 -
2.9 - Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
2.10 -
2.11 - Permission is hereby granted, free of charge, to any person obtaining a copy
2.12 - of this software and associated documentation files (the "Software"), to deal
2.13 - in the Software without restriction, including without limitation the rights
2.14 - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
2.15 - copies of the Software, and to permit persons to whom the Software is
2.16 - furnished to do so, subject to the following conditions:
2.17 -
2.18 - The above copyright notice and this permission notice shall be included in
2.19 - all copies or substantial portions of the Software.
2.20 -
2.21 - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
2.22 - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2.23 - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
2.24 - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2.25 - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2.26 - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2.27 - THE SOFTWARE.
2.28 -
2.29 --->
2.30 -<actions>
2.31 - <action>
2.32 - <actionName>run</actionName>
2.33 - <goals>
2.34 - <goal>process-classes</goal>
2.35 - <goal>bck2brwsr:brwsr</goal>
2.36 - </goals>
2.37 - </action>
2.38 - <action>
2.39 - <actionName>debug</actionName>
2.40 - <goals>
2.41 - <goal>process-classes</goal>
2.42 - <goal>bck2brwsr:brwsr</goal>
2.43 - </goals>
2.44 - <properties>
2.45 - <jpda.listen>maven</jpda.listen>
2.46 - </properties>
2.47 - </action>
2.48 -</actions>
3.1 --- a/twitter/nbactions.xml Thu Jun 20 13:18:10 2013 +0200
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,56 +0,0 @@
3.4 -<?xml version="1.0" encoding="UTF-8"?>
3.5 -<!--
3.6 -
3.7 - The MIT License (MIT)
3.8 -
3.9 - Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
3.10 -
3.11 - Permission is hereby granted, free of charge, to any person obtaining a copy
3.12 - of this software and associated documentation files (the "Software"), to deal
3.13 - in the Software without restriction, including without limitation the rights
3.14 - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
3.15 - copies of the Software, and to permit persons to whom the Software is
3.16 - furnished to do so, subject to the following conditions:
3.17 -
3.18 - The above copyright notice and this permission notice shall be included in
3.19 - all copies or substantial portions of the Software.
3.20 -
3.21 - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
3.22 - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
3.23 - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
3.24 - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
3.25 - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3.26 - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
3.27 - THE SOFTWARE.
3.28 -
3.29 ---><actions>
3.30 - <action>
3.31 - <actionName>debug</actionName>
3.32 - <packagings>
3.33 - <packaging>jar</packaging>
3.34 - </packagings>
3.35 - <goals>
3.36 - <goal>process-classes</goal>
3.37 - <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
3.38 - </goals>
3.39 - <properties>
3.40 - <exec.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.apidesign.html.demo.twitter.TwitterMain</exec.args>
3.41 - <exec.executable>java</exec.executable>
3.42 - <jpda.listen>true</jpda.listen>
3.43 - </properties>
3.44 - </action>
3.45 - <action>
3.46 - <actionName>run</actionName>
3.47 - <packagings>
3.48 - <packaging>jar</packaging>
3.49 - </packagings>
3.50 - <goals>
3.51 - <goal>process-classes</goal>
3.52 - <goal>org.codehaus.mojo:exec-maven-plugin:1.2.1:exec</goal>
3.53 - </goals>
3.54 - <properties>
3.55 - <exec.args>-classpath %classpath org.apidesign.html.demo.twitter.TwitterMain</exec.args>
3.56 - <exec.executable>java</exec.executable>
3.57 - </properties>
3.58 - </action>
3.59 -</actions>
4.1 --- a/twitter/pom.xml Thu Jun 20 13:18:10 2013 +0200
4.2 +++ b/twitter/pom.xml Thu Jun 20 13:28:40 2013 +0200
4.3 @@ -2,7 +2,7 @@
4.4 <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">
4.5 <modelVersion>4.0.0</modelVersion>
4.6
4.7 - <groupId>org.apidesign.bck2brwsr</groupId>
4.8 + <groupId>org.apidesign.html</groupId>
4.9 <artifactId>demo-twitter</artifactId>
4.10 <version>1.0-SNAPSHOT</version>
4.11 <packaging>jar</packaging>
4.12 @@ -12,17 +12,15 @@
4.13 <version>1.0-SNAPSHOT</version>
4.14 </parent>
4.15
4.16 - <name>Fx/Bck2Brwsr's Twttr</name>
4.17 + <name>Fx Twttr</name>
4.18 <description>
4.19 Rewrite of knockout.js example to use model written in Java and
4.20 - execute using FxBrwsr or Bck2Brwsr.
4.21 + displayed in a JavaFX WebView.
4.22 </description>
4.23
4.24 <properties>
4.25 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4.26 <net.java.html.version>0.4-SNAPSHOT</net.java.html.version>
4.27 - <bck2brwsr.version>0.8-SNAPSHOT</bck2brwsr.version>
4.28 - <bck2brwsr.obfuscationlevel>MINIMAL</bck2brwsr.obfuscationlevel>
4.29 <brwsr.startpage>org/apidesign/html/demo/twitter/index.html</brwsr.startpage>
4.30 </properties>
4.31
4.32 @@ -44,22 +42,6 @@
4.33 <build>
4.34 <plugins>
4.35 <plugin>
4.36 - <groupId>org.apidesign.bck2brwsr</groupId>
4.37 - <artifactId>bck2brwsr-maven-plugin</artifactId>
4.38 - <version>${bck2brwsr.version}</version>
4.39 - <executions>
4.40 - <execution>
4.41 - <goals>
4.42 - <goal>brwsr</goal>
4.43 - </goals>
4.44 - </execution>
4.45 - </executions>
4.46 - <configuration>
4.47 - <startpage>${brwsr.startpage}</startpage>
4.48 - <launcher>${brwsr}</launcher>
4.49 - </configuration>
4.50 - </plugin>
4.51 - <plugin>
4.52 <groupId>org.apache.maven.plugins</groupId>
4.53 <artifactId>maven-compiler-plugin</artifactId>
4.54 <version>2.3.2</version>
4.55 @@ -110,12 +92,6 @@
4.56 <scope>test</scope>
4.57 </dependency>
4.58 <dependency>
4.59 - <groupId>org.apidesign.bck2brwsr</groupId>
4.60 - <artifactId>vmtest</artifactId>
4.61 - <version>${bck2brwsr.version}</version>
4.62 - <scope>test</scope>
4.63 - </dependency>
4.64 - <dependency>
4.65 <groupId>org.apidesign.html</groupId>
4.66 <artifactId>net.java.html.json</artifactId>
4.67 <version>${net.java.html.version}</version>
4.68 @@ -182,87 +158,6 @@
4.69 <artifactId>ko-fx</artifactId>
4.70 <version>${net.java.html.version}</version>
4.71 </dependency>
4.72 - <dependency>
4.73 - <groupId>org.apidesign.bck2brwsr</groupId>
4.74 - <artifactId>launcher.fx</artifactId>
4.75 - <version>${bck2brwsr.version}</version>
4.76 - <scope>runtime</scope>
4.77 - </dependency>
4.78 - </dependencies>
4.79 - </profile>
4.80 - <profile>
4.81 - <id>bck2brwsr</id>
4.82 - <activation>
4.83 - <property>
4.84 - <name>brwsr</name>
4.85 - <value>bck2brwsr</value>
4.86 - </property>
4.87 - </activation>
4.88 - <build>
4.89 - <plugins>
4.90 - <plugin>
4.91 - <groupId>org.apidesign.bck2brwsr</groupId>
4.92 - <artifactId>bck2brwsr-maven-plugin</artifactId>
4.93 - <executions>
4.94 - <execution>
4.95 - <goals>
4.96 - <goal>j2js</goal>
4.97 - </goals>
4.98 - </execution>
4.99 - </executions>
4.100 - <configuration>
4.101 - <javascript>${project.build.directory}/bck2brwsr.js</javascript>
4.102 - <obfuscation>${bck2brwsr.obfuscationlevel}</obfuscation>
4.103 - </configuration>
4.104 - </plugin>
4.105 - <plugin>
4.106 - <groupId>org.apache.maven.plugins</groupId>
4.107 - <artifactId>maven-compiler-plugin</artifactId>
4.108 - <configuration>
4.109 - <compilerArguments>
4.110 - <bootclasspath>netbeans.ignore.jdk.bootclasspath</bootclasspath>
4.111 - </compilerArguments>
4.112 - </configuration>
4.113 - </plugin>
4.114 - <plugin>
4.115 - <artifactId>maven-assembly-plugin</artifactId>
4.116 - <version>2.4</version>
4.117 - <executions>
4.118 - <execution>
4.119 - <id>distro-assembly</id>
4.120 - <phase>package</phase>
4.121 - <goals>
4.122 - <goal>single</goal>
4.123 - </goals>
4.124 - <configuration>
4.125 - <descriptors>
4.126 - <descriptor>src/main/assembly/bck2brwsr.xml</descriptor>
4.127 - </descriptors>
4.128 - </configuration>
4.129 - </execution>
4.130 - </executions>
4.131 - </plugin>
4.132 - </plugins>
4.133 - </build>
4.134 - <dependencies>
4.135 - <dependency>
4.136 - <groupId>org.apidesign.bck2brwsr</groupId>
4.137 - <artifactId>emul</artifactId>
4.138 - <version>${bck2brwsr.version}</version>
4.139 - <classifier>rt</classifier>
4.140 - </dependency>
4.141 - <dependency>
4.142 - <groupId>org.apidesign.html</groupId>
4.143 - <artifactId>ko-bck2brwsr</artifactId>
4.144 - <version>${net.java.html.version}</version>
4.145 - <scope>runtime</scope>
4.146 - </dependency>
4.147 - <dependency>
4.148 - <groupId>org.apidesign.bck2brwsr</groupId>
4.149 - <artifactId>launcher.http</artifactId>
4.150 - <version>${bck2brwsr.version}</version>
4.151 - <scope>test</scope>
4.152 - </dependency>
4.153 </dependencies>
4.154 </profile>
4.155 </profiles>
5.1 --- a/twitter/src/main/assembly/bck2brwsr.xml Thu Jun 20 13:18:10 2013 +0200
5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
5.3 @@ -1,68 +0,0 @@
5.4 -<?xml version="1.0"?>
5.5 -<!--
5.6 -
5.7 - The MIT License (MIT)
5.8 -
5.9 - Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
5.10 -
5.11 - Permission is hereby granted, free of charge, to any person obtaining a copy
5.12 - of this software and associated documentation files (the "Software"), to deal
5.13 - in the Software without restriction, including without limitation the rights
5.14 - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5.15 - copies of the Software, and to permit persons to whom the Software is
5.16 - furnished to do so, subject to the following conditions:
5.17 -
5.18 - The above copyright notice and this permission notice shall be included in
5.19 - all copies or substantial portions of the Software.
5.20 -
5.21 - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5.22 - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
5.23 - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
5.24 - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
5.25 - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
5.26 - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
5.27 - THE SOFTWARE.
5.28 -
5.29 --->
5.30 -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5.31 - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
5.32 -
5.33 - <id>bck2brwsr</id>
5.34 - <formats>
5.35 - <format>zip</format>
5.36 - </formats>
5.37 - <baseDirectory>public_html</baseDirectory>
5.38 - <dependencySets>
5.39 - <dependencySet>
5.40 - <useProjectArtifact>false</useProjectArtifact>
5.41 - <scope>runtime</scope>
5.42 - <outputDirectory>lib</outputDirectory>
5.43 - <includes>
5.44 - <include>*:jar</include>
5.45 - <include>*:rt</include>
5.46 - </includes>
5.47 - </dependencySet>
5.48 - </dependencySets>
5.49 - <fileSets>
5.50 - <fileSet>
5.51 - <directory>${project.build.directory}/classes/org/apidesign/html/demo/twitter/</directory>
5.52 - <includes>
5.53 - <include>**/*</include>
5.54 - </includes>
5.55 - <excludes>
5.56 - <exclude>**/*.class</exclude>
5.57 - </excludes>
5.58 - <outputDirectory>/</outputDirectory>
5.59 - </fileSet>
5.60 - </fileSets>
5.61 - <files>
5.62 - <file>
5.63 - <source>${project.build.directory}/${project.build.finalName}.jar</source>
5.64 - <outputDirectory>/</outputDirectory>
5.65 - </file>
5.66 - <file>
5.67 - <source>${project.build.directory}/bck2brwsr.js</source>
5.68 - <outputDirectory>/</outputDirectory>
5.69 - </file>
5.70 - </files>
5.71 -</assembly>
5.72 \ No newline at end of file
6.1 --- a/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterMain.java Thu Jun 20 13:18:10 2013 +0200
6.2 +++ b/twitter/src/main/java/org/apidesign/html/demo/twitter/TwitterMain.java Thu Jun 20 13:28:40 2013 +0200
6.3 @@ -1,3 +1,26 @@
6.4 +/**
6.5 + * The MIT License (MIT)
6.6 + *
6.7 + * Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
6.8 + *
6.9 + * Permission is hereby granted, free of charge, to any person obtaining a copy
6.10 + * of this software and associated documentation files (the "Software"), to deal
6.11 + * in the Software without restriction, including without limitation the rights
6.12 + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
6.13 + * copies of the Software, and to permit persons to whom the Software is
6.14 + * furnished to do so, subject to the following conditions:
6.15 + *
6.16 + * The above copyright notice and this permission notice shall be included in
6.17 + * all copies or substantial portions of the Software.
6.18 + *
6.19 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
6.20 + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6.21 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6.22 + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
6.23 + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
6.24 + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
6.25 + * THE SOFTWARE.
6.26 + */
6.27 package org.apidesign.html.demo.twitter;
6.28
6.29 import net.java.html.boot.BrowserBuilder;
7.1 --- a/twitter/src/main/resources/org/apidesign/html/demo/twitter/index.html Thu Jun 20 13:18:10 2013 +0200
7.2 +++ b/twitter/src/main/resources/org/apidesign/html/demo/twitter/index.html Thu Jun 20 13:28:40 2013 +0200
7.3 @@ -33,7 +33,7 @@
7.4 <!DOCTYPE html>
7.5 <html xmlns="http://www.w3.org/1999/xhtml">
7.6 <head>
7.7 - <title>Bck2Brwsr's Twitter</title>
7.8 + <title>Twitter in Java and HTML</title>
7.9 </head>
7.10 <body>
7.11 <link href='twitterExample.css' rel='Stylesheet' ></link>
7.12 @@ -44,13 +44,12 @@
7.13 </style>
7.14
7.15
7.16 - <h2>Bck2Brwsr's Twitter</h2>
7.17 + <h2>Twitter in Java and HTML</h2>
7.18
7.19 <p>
7.20 This code is based on original <a href="http://knockoutjs.com/examples/twitter.html">knockout.js Twitter example</a> and
7.21 - uses almost unmodified HTML page. It just changes the model. It
7.22 - is written in Java language and it is executed using <a href="http://bck2brwsr.apidesign.org">Bck2Brwsr</a>
7.23 - virtual machine. The Java source code has about 190 lines and is available
7.24 + uses almost unmodified HTML page. It just changes the model and executes
7.25 + it via HotSpot virtual machine. The Java source code has about 190 lines and is available
7.26 <a href="http://source.apidesign.org/hg/bck2brwsr/file/7fc6b7e9c982/javaquery/demo-twitter/src/main/java/org/apidesign/bck2brwsr/demo/twitter/TwitterClient.java">here</a>
7.27 - in fact it may even be more dense than the original JavaScript model.
7.28 </p>