You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2018/11/06 06:31:24 UTC
[incubator-netbeans-html4j] annotated tag release-1.6 updated
(76c5776 -> bdd8bfd)
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a change to annotated tag release-1.6
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git.
*** WARNING: tag release-1.6 was modified! ***
from 76c5776 (tag)
to bdd8bfd (tag)
tagging e38b59f2294c9bbf9dc077e263e8dbdff25ed6ae (commit)
by Jaroslav Tulach
on Tue Nov 6 07:03:27 2018 +0100
- Log -----------------------------------------------------------------
[maven-release-plugin] copy for tag release-1.6
-----------------------------------------------------------------------
omit e4bb480 [maven-release-plugin] prepare release release-1.6
new 382b5f8 Make sure the created sub-model objects are connected to the appropriate context
new e38b59f [maven-release-plugin] prepare release release-1.6
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
annotated tag are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (76c5776)
\
N -- N -- N refs/tags/release-1.6 (bdd8bfd)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../net/java/html/json/tests/KnockoutTest.java | 13 +++--
.../net/java/html/json/tests/PairModelTest.java | 67 ++++++++++++++++++++++
.../netbeans/html/json/impl/ModelProcessor.java | 4 +-
.../netbeans/html/json/impl/DeepChangeTest.java | 2 -
4 files changed, 77 insertions(+), 9 deletions(-)
create mode 100644 json-tck/src/test/java/net/java/html/json/tests/PairModelTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans-html4j] 01/02: Make sure the created sub-model
objects are connected to the appropriate context
Posted by jt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to annotated tag release-1.6
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git
commit 382b5f8c8727aec7a482fb1435d1a4255c8090ee
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Tue Nov 6 06:57:13 2018 +0100
Make sure the created sub-model objects are connected to the appropriate context
---
.../net/java/html/json/tests/KnockoutTest.java | 13 +++--
.../net/java/html/json/tests/PairModelTest.java | 67 ++++++++++++++++++++++
.../netbeans/html/json/impl/ModelProcessor.java | 4 +-
.../netbeans/html/json/impl/DeepChangeTest.java | 2 -
4 files changed, 77 insertions(+), 9 deletions(-)
diff --git a/json-tck/src/main/java/net/java/html/json/tests/KnockoutTest.java b/json-tck/src/main/java/net/java/html/json/tests/KnockoutTest.java
index e4cd463..f0bdcc3 100644
--- a/json-tck/src/main/java/net/java/html/json/tests/KnockoutTest.java
+++ b/json-tck/src/main/java/net/java/html/json/tests/KnockoutTest.java
@@ -300,10 +300,13 @@ public final class KnockoutTest {
""
);
- js = Models.bind(new KnockoutModel(), newContext());
- js.getArchetypes().add(new ArchetypeData("ko4j", "org.netbeans.html", "0.8.3", "ko4j", "ko4j", null));
- js.getArchetypes().add(new ArchetypeData("crud", "org.netbeans.html", "0.8.3", "crud", "crud", null));
- js.getArchetypes().add(new ArchetypeData("3rd", "org.netbeans.html", "0.8.3", "3rd", "3rd", null));
+ {
+ KnockoutModel km = new KnockoutModel();
+ km.getArchetypes().add(new ArchetypeData("ko4j", "org.netbeans.html", "0.8.3", "ko4j", "ko4j", null));
+ km.getArchetypes().add(new ArchetypeData("crud", "org.netbeans.html", "0.8.3", "crud", "crud", null));
+ km.getArchetypes().add(new ArchetypeData("3rd", "org.netbeans.html", "0.8.3", "3rd", "3rd", null));
+ js = Models.bind(km, newContext());
+ }
js.setArchetype(js.getArchetypes().get(1));
js.applyBindings();
@@ -339,7 +342,7 @@ public final class KnockoutTest {
if (preApply) {
js.applyBindings();
}
- js.setArchetype(new ArchetypeData());
+ js.setArchetype(Models.bind(new ArchetypeData(), newContext()));
js.getArchetype().setGroupId("org.netbeans.html");
js.applyBindings();
diff --git a/json-tck/src/test/java/net/java/html/json/tests/PairModelTest.java b/json-tck/src/test/java/net/java/html/json/tests/PairModelTest.java
new file mode 100644
index 0000000..b0e0da8
--- /dev/null
+++ b/json-tck/src/test/java/net/java/html/json/tests/PairModelTest.java
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package net.java.html.json.tests;
+
+import java.lang.reflect.Field;
+import net.java.html.BrwsrCtx;
+import net.java.html.json.Models;
+import org.netbeans.html.context.spi.Contexts;
+import org.netbeans.html.json.spi.Proto;
+import org.testng.Assert;
+import static org.testng.Assert.assertEquals;
+import org.testng.annotations.Test;
+
+public class PairModelTest {
+
+ public PairModelTest() {
+ }
+
+ @Test
+ public void testClonePairs() throws Exception {
+ BrwsrCtx ctx = Contexts.newBuilder().build();
+ Pair p = new Pair(null, null, new Pair("First", "Last", null));
+
+ assertCtx(p, p.getNext());
+
+ Pair c = Models.bind(p, ctx);
+
+ assertCtx(c, c.getNext());
+ }
+
+ @Test
+ public void testCloneDefaultPair() throws Exception {
+ BrwsrCtx ctx = Contexts.newBuilder().build();
+ Pair p = new Pair();
+ Pair c = Models.bind(p, ctx);
+
+ Assert.assertNotNull(p.getNext(), "Default value of p.next is created");
+ Assert.assertNotNull(c.getNext(), "Default value of c.next is created");
+
+ assertCtx(p, p.getNext());
+ assertCtx(c, c.getNext());
+ }
+
+ private static void assertCtx(Pair first, Pair second) throws Exception {
+ Field field = first.getClass().getDeclaredField("proto");
+ field.setAccessible(true);
+ Proto proto1 = (Proto) field.get(first);
+ Proto proto2 = (Proto) field.get(second);
+ assertEquals(proto1.getContext(), proto2.getContext());
+ }
+}
diff --git a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java
index c8babca..25c4378 100644
--- a/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java
+++ b/json/src/main/java/org/netbeans/html/json/impl/ModelProcessor.java
@@ -671,7 +671,7 @@ public final class ModelProcessor extends AbstractProcessor {
w.write(" public " + tn + " " + gs[0] + "() {\n");
w.write(" proto.accessProperty(\"" + p.name() + "\");\n");
if (isModel[0]) {
- w.write(" if (prop_" + p.name() + " == TYPE) prop_" + p.name() + " = new " + tn +"();\n");
+ w.write(" if (prop_" + p.name() + " == TYPE) prop_" + p.name() + " = net.java.html.json.Models.bind(new " + tn +"(), proto.getContext());\n");
}
w.write(" return (" + tn + ")prop_" + p.name() + ";\n");
w.write(" }\n");
@@ -1808,7 +1808,7 @@ public final class ModelProcessor extends AbstractProcessor {
w.write(" ret.prop_" + p.name() + " = " + gs[0] + "();\n");
continue;
}
- w.write(" ret.prop_" + p.name() + " = prop_" + p.name() + " == null ? null : prop_" + p.name() + " == TYPE ? TYPE : " + gs[0] + "().clone();\n");
+ w.write(" ret.prop_" + p.name() + " = prop_" + p.name() + " == null ? null : prop_" + p.name() + " == TYPE ? TYPE : net.java.html.json.Models.bind(" + gs[0] + "(), ctx);\n");
} else {
w.write(" proto.cloneList(ret." + gs[0] + "(), ctx, prop_" + p.name() + ");\n");
}
diff --git a/json/src/test/java/org/netbeans/html/json/impl/DeepChangeTest.java b/json/src/test/java/org/netbeans/html/json/impl/DeepChangeTest.java
index 4e3427a..ed3f3c2 100644
--- a/json/src/test/java/org/netbeans/html/json/impl/DeepChangeTest.java
+++ b/json/src/test/java/org/netbeans/html/json/impl/DeepChangeTest.java
@@ -179,8 +179,6 @@ public class DeepChangeTest {
One o = (One)v;
assertEquals(o.changes, 0, "No changes so far");
assertFalse(o.pb.isReadOnly(), "Normal property");
- assertEquals(o.get(), myY);
- assertSame(o.get(), realY);
final MyY newY = new MyY("Hi", 1);
p.setOne(newY);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[incubator-netbeans-html4j] 02/02: [maven-release-plugin] prepare
release release-1.6
Posted by jt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to annotated tag release-1.6
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git
commit e38b59f2294c9bbf9dc077e263e8dbdff25ed6ae
Author: Jaroslav Tulach <ja...@apidesign.org>
AuthorDate: Tue Nov 6 07:03:27 2018 +0100
[maven-release-plugin] prepare release release-1.6
---
boot-agent-test/pom.xml | 2 +-
boot-fx/pom.xml | 4 ++--
boot-script/pom.xml | 4 ++--
boot/pom.xml | 4 ++--
context/pom.xml | 4 ++--
equinox-agentclass-hook/pom.xml | 2 +-
geo/pom.xml | 4 ++--
html4j-maven-plugin/pom.xml | 4 ++--
json-tck/pom.xml | 6 +++---
json/pom.xml | 4 ++--
ko-felix-test/pom.xml | 2 +-
ko-osgi-test/pom.xml | 2 +-
ko-ws-tyrus/pom.xml | 4 ++--
ko4j/pom.xml | 4 ++--
pom.xml | 4 ++--
sound/pom.xml | 4 ++--
xhr4j/pom.xml | 4 ++--
17 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/boot-agent-test/pom.xml b/boot-agent-test/pom.xml
index d070c90..a7fbd07 100644
--- a/boot-agent-test/pom.xml
+++ b/boot-agent-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<artifactId>boot-agent-test</artifactId>
<packaging>jar</packaging>
diff --git a/boot-fx/pom.xml b/boot-fx/pom.xml
index f486bc4..49b8044 100644
--- a/boot-fx/pom.xml
+++ b/boot-fx/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.boot.fx</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<name>FX WebView Bootstrap</name>
<packaging>bundle</packaging>
<url>http://maven.apache.org</url>
diff --git a/boot-script/pom.xml b/boot-script/pom.xml
index ab65024..d26a47c 100644
--- a/boot-script/pom.xml
+++ b/boot-script/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<name>Presenter via javax.script</name>
<artifactId>net.java.html.boot.script</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<properties>
<netbeans.compile.on.save>NONE</netbeans.compile.on.save>
diff --git a/boot/pom.xml b/boot/pom.xml
index c86d162..abae40e 100644
--- a/boot/pom.xml
+++ b/boot/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.boot</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>Browser Bootstrap</name>
<url>http://maven.apache.org</url>
diff --git a/context/pom.xml b/context/pom.xml
index 1f1cc29..8a2a96e 100644
--- a/context/pom.xml
+++ b/context/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>HTML Context</name>
<url>http://maven.apache.org</url>
diff --git a/equinox-agentclass-hook/pom.xml b/equinox-agentclass-hook/pom.xml
index 9522247..5f32a1b 100644
--- a/equinox-agentclass-hook/pom.xml
+++ b/equinox-agentclass-hook/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<name>AgentClass Hook for Equinox</name>
<artifactId>equinox-agentclass-hook</artifactId>
diff --git a/geo/pom.xml b/geo/pom.xml
index 928ece3..d925f30 100644
--- a/geo/pom.xml
+++ b/geo/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.geo</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>Geolocation API</name>
<url>http://maven.apache.org</url>
diff --git a/html4j-maven-plugin/pom.xml b/html4j-maven-plugin/pom.xml
index 491cb09..2322275 100644
--- a/html4j-maven-plugin/pom.xml
+++ b/html4j-maven-plugin/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<packaging>maven-plugin</packaging>
<groupId>org.netbeans.html</groupId>
<artifactId>html4j-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<name>Html for Java Maven Plugin</name>
<url>http://maven.apache.org</url>
<description>Maven plugin to post process the classes with @JavaScriptBody annotations</description>
diff --git a/json-tck/pom.xml b/json-tck/pom.xml
index 20e5612..f110b6e 100644
--- a/json-tck/pom.xml
+++ b/json-tck/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.json.tck</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>HTML for Java TCK</name>
<url>http://maven.apache.org</url>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.json</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<type>jar</type>
</dependency>
<dependency>
diff --git a/json/pom.xml b/json/pom.xml
index 0c84eac..52f16c7 100644
--- a/json/pom.xml
+++ b/json/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.json</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>JSON Model in Java</name>
<url>http://maven.apache.org</url>
diff --git a/ko-felix-test/pom.xml b/ko-felix-test/pom.xml
index 6f2a9cd..7739031 100644
--- a/ko-felix-test/pom.xml
+++ b/ko-felix-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<name>KO Tests in Felix OSGi Container</name>
<artifactId>ko-felix-test</artifactId>
diff --git a/ko-osgi-test/pom.xml b/ko-osgi-test/pom.xml
index 52af266..809fba3 100644
--- a/ko-osgi-test/pom.xml
+++ b/ko-osgi-test/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<name>KO Tests in Equinox OSGi Container</name>
<artifactId>ko-osgi-test</artifactId>
diff --git a/ko-ws-tyrus/pom.xml b/ko-ws-tyrus/pom.xml
index 9f39a7b..7f82ad1 100644
--- a/ko-ws-tyrus/pom.xml
+++ b/ko-ws-tyrus/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>ko-ws-tyrus</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>Tyrus Based WebSockets</name>
<url>http://maven.apache.org</url>
diff --git a/ko4j/pom.xml b/ko4j/pom.xml
index 71ac1a2..2661555 100644
--- a/ko4j/pom.xml
+++ b/ko4j/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>ko4j</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>Knockout.js for Java</name>
<url>http://maven.apache.org</url>
diff --git a/pom.xml b/pom.xml
index 70d68d3..01fe7a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>pom</packaging>
<name>HTML APIs via Java</name>
<parent>
@@ -78,7 +78,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf//incubator-netbeans-html4j.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git</developerConnection>
<url>https://github.com/apache/incubator-netbeans-html4j/tree/${project.scm.tag}</url>
- <tag>master</tag>
+ <tag>release-1.6</tag>
</scm>
<issueManagement>
<system>jira</system>
diff --git a/sound/pom.xml b/sound/pom.xml
index a8041e8..cf41655 100644
--- a/sound/pom.xml
+++ b/sound/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>net.java.html.sound</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>Sound API via HTML</name>
<url>http://maven.apache.org</url>
diff --git a/xhr4j/pom.xml b/xhr4j/pom.xml
index f54df9e..5702257 100644
--- a/xhr4j/pom.xml
+++ b/xhr4j/pom.xml
@@ -24,11 +24,11 @@
<parent>
<groupId>org.netbeans.html</groupId>
<artifactId>pom</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
</parent>
<groupId>org.netbeans.html</groupId>
<artifactId>xhr4j</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>1.6</version>
<packaging>bundle</packaging>
<name>XHR via Java</name>
<url>http://maven.apache.org</url>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists