1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/boot-fx/src/test/java/org/apidesign/html/boot/fx/FxJavaScriptTst.java Tue Jan 07 08:55:34 2014 +0100
1.3 @@ -0,0 +1,55 @@
1.4 +/**
1.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.6 + *
1.7 + * Copyright 2013-2013 Oracle and/or its affiliates. All rights reserved.
1.8 + *
1.9 + * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
1.10 + * Other names may be trademarks of their respective owners.
1.11 + *
1.12 + * The contents of this file are subject to the terms of either the GNU
1.13 + * General Public License Version 2 only ("GPL") or the Common
1.14 + * Development and Distribution License("CDDL") (collectively, the
1.15 + * "License"). You may not use this file except in compliance with the
1.16 + * License. You can obtain a copy of the License at
1.17 + * http://www.netbeans.org/cddl-gplv2.html
1.18 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.19 + * specific language governing permissions and limitations under the
1.20 + * License. When distributing the software, include this License Header
1.21 + * Notice in each file and include the License file at
1.22 + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
1.23 + * particular file as subject to the "Classpath" exception as provided
1.24 + * by Oracle in the GPL Version 2 section of the License file that
1.25 + * accompanied this code. If applicable, add the following below the
1.26 + * License Header, with the fields enclosed by brackets [] replaced by
1.27 + * your own identifying information:
1.28 + * "Portions Copyrighted [year] [name of copyright owner]"
1.29 + *
1.30 + * Contributor(s):
1.31 + *
1.32 + * The Original Software is NetBeans. The Initial Developer of the Original
1.33 + * Software is Oracle. Portions Copyright 2013-2013 Oracle. All Rights Reserved.
1.34 + *
1.35 + * If you wish your version of this file to be governed by only the CDDL
1.36 + * or only the GPL Version 2, indicate your decision by adding
1.37 + * "[Contributor] elects to include this software in this distribution
1.38 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
1.39 + * single choice of license, a recipient has the option to distribute
1.40 + * your version of this file under either the CDDL, the GPL Version 2 or
1.41 + * to extend the choice of license to its licensees as provided above.
1.42 + * However, if you add GPL Version 2 code and therefore, elected the GPL
1.43 + * Version 2 license, then the option applies only if the new code is
1.44 + * made subject to such option by the copyright holder.
1.45 + */
1.46 +package org.apidesign.html.boot.fx;
1.47 +
1.48 +import org.apidesign.html.json.tck.JavaScriptTCK;
1.49 +
1.50 +/**
1.51 + *
1.52 + * @author Jaroslav Tulach <jtulach@netbeans.org>
1.53 + */
1.54 +public final class FxJavaScriptTst extends JavaScriptTCK {
1.55 + public static Class[] tests() {
1.56 + return testClasses();
1.57 + }
1.58 +}
2.1 --- a/boot/src/main/java/org/netbeans/html/boot/impl/FnContext.java Tue Jan 07 08:21:57 2014 +0100
2.2 +++ b/boot/src/main/java/org/netbeans/html/boot/impl/FnContext.java Tue Jan 07 08:55:34 2014 +0100
2.3 @@ -87,9 +87,9 @@
2.4 return prev;
2.5 }
2.6
2.7 - public static Fn.Presenter currentPresenter(boolean canReturnNull) {
2.8 + public static Fn.Presenter currentPresenter(boolean fail) {
2.9 Fn.Presenter p = CURRENT.get();
2.10 - if (p == null && !canReturnNull) {
2.11 + if (p == null && fail) {
2.12 throw new IllegalStateException("No current WebView context around!");
2.13 }
2.14 return p;
3.1 --- a/html4j-maven-plugin/pom.xml Tue Jan 07 08:21:57 2014 +0100
3.2 +++ b/html4j-maven-plugin/pom.xml Tue Jan 07 08:55:34 2014 +0100
3.3 @@ -3,8 +3,8 @@
3.4 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3.5 <modelVersion>4.0.0</modelVersion>
3.6 <parent>
3.7 - <groupId>org.apidesign</groupId>
3.8 - <artifactId>html</artifactId>
3.9 + <groupId>org.netbeans.html</groupId>
3.10 + <artifactId>pom</artifactId>
3.11 <version>0.7-SNAPSHOT</version>
3.12 </parent>
3.13 <packaging>maven-plugin</packaging>
4.1 --- a/json/src/main/java/net/java/html/json/package.html Tue Jan 07 08:21:57 2014 +0100
4.2 +++ b/json/src/main/java/net/java/html/json/package.html Tue Jan 07 08:55:34 2014 +0100
4.3 @@ -68,7 +68,7 @@
4.4 Java. The necessary JavaScript needed for the HTML bindings remains hidden
4.5 as an implementation detail of communication between the generated model
4.6 class(es) and appropriate technology bridge (like artifact with id <code>ko-fx</code>
4.7 - and group id <code>org.apidesign.html</code>).
4.8 + and group id <code>org.netbeans.html</code>).
4.9 </p>
4.10 <p>
4.11 The model classes can be used for JSON based server communication. Just
5.1 --- a/ko-archetype-test/pom.xml Tue Jan 07 08:21:57 2014 +0100
5.2 +++ b/ko-archetype-test/pom.xml Tue Jan 07 08:55:34 2014 +0100
5.3 @@ -17,9 +17,9 @@
5.4 </properties>
5.5 <dependencies>
5.6 <dependency>
5.7 - <groupId>${project.groupId}</groupId>
5.8 + <groupId>org.apidesign.html</groupId>
5.9 <artifactId>knockout4j-archetype</artifactId>
5.10 - <version>0.7-SNAPSHOT</version>
5.11 + <version>${project.version}</version>
5.12 </dependency>
5.13 <dependency>
5.14 <groupId>org.testng</groupId>
6.1 --- a/ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/ArchetypeVersionTest.java Tue Jan 07 08:21:57 2014 +0100
6.2 +++ b/ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/ArchetypeVersionTest.java Tue Jan 07 08:55:34 2014 +0100
6.3 @@ -114,7 +114,7 @@
6.4
6.5 static String findCurrentVersion() throws XPathExpressionException, IOException, ParserConfigurationException, SAXException, XPathFactoryConfigurationException {
6.6 final ClassLoader l = ArchetypeVersionTest.class.getClassLoader();
6.7 - URL u = l.getResource("META-INF/maven/org.netbeans.html/knockout4j-archetype/pom.xml");
6.8 + URL u = l.getResource("META-INF/maven/org.apidesign.html/knockout4j-archetype/pom.xml");
6.9 assertNotNull(u, "Own pom found: " + System.getProperty("java.class.path"));
6.10
6.11 final XPathFactory fact = XPathFactory.newInstance();
7.1 --- a/ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/VerifyArchetypeTest.java Tue Jan 07 08:21:57 2014 +0100
7.2 +++ b/ko-archetype-test/src/test/java/org/netbeans/html/archetype/test/VerifyArchetypeTest.java Tue Jan 07 08:55:34 2014 +0100
7.3 @@ -85,7 +85,7 @@
7.4 sysProp.put("groupId", "org.someuser.test");
7.5 sysProp.put("artifactId", "o-a-test");
7.6 sysProp.put("package", "org.someuser.test.oat");
7.7 - sysProp.put("archetypeGroupId", "org.netbeans.html");
7.8 + sysProp.put("archetypeGroupId", "org.apidesign.html");
7.9 sysProp.put("archetypeArtifactId", "knockout4j-archetype");
7.10 sysProp.put("archetypeVersion", ArchetypeVersionTest.findCurrentVersion());
7.11
8.1 --- a/ko-archetype/pom.xml Tue Jan 07 08:21:57 2014 +0100
8.2 +++ b/ko-archetype/pom.xml Tue Jan 07 08:55:34 2014 +0100
8.3 @@ -6,7 +6,7 @@
8.4 <artifactId>pom</artifactId>
8.5 <version>0.7-SNAPSHOT</version>
8.6 </parent>
8.7 - <groupId>org.netbeans.html</groupId>
8.8 + <groupId>org.apidesign.html</groupId>
8.9 <artifactId>knockout4j-archetype</artifactId>
8.10 <version>0.7-SNAPSHOT</version>
8.11 <packaging>jar</packaging>