You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/27 13:30:09 UTC
[GitHub] geertjanw closed pull request #905: Enabling ko4j DOM inspector &
editor support
geertjanw closed pull request #905: Enabling ko4j DOM inspector & editor support
URL: https://github.com/apache/incubator-netbeans/pull/905
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ide/web.webkit.debugging/nbproject/project.properties b/ide/web.webkit.debugging/nbproject/project.properties
index ab06b416c0..75a1a5ecaf 100644
--- a/ide/web.webkit.debugging/nbproject/project.properties
+++ b/ide/web.webkit.debugging/nbproject/project.properties
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/maven.htmlui/manifest.mf b/java/maven.htmlui/manifest.mf
index 487e290fd4..63e418e200 100644
--- a/java/maven.htmlui/manifest.mf
+++ b/java/maven.htmlui/manifest.mf
@@ -3,6 +3,7 @@ AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.maven.htmlui
OpenIDE-Module-Provides: org.netbeans.modules.maven.archetype
OpenIDE-Module-Requires: org.netbeans.api.templates.wizard
+OpenIDE-Module-Recommends: org.netbeans.modules.ko4j.debugging,org.netbeans.modules.ko4j.editing
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/htmlui/Bundle.properties
OpenIDE-Module-Needs: org.netbeans.api.templates.wizard, javax.script.ScriptEngine.freemarker
OpenIDE-Module-Specification-Version: 1.3
diff --git a/enterprise/ko4j.debugging/build.xml b/nb/ko4j.debugging/build.xml
similarity index 93%
rename from enterprise/ko4j.debugging/build.xml
rename to nb/ko4j.debugging/build.xml
index 240362dd33..0820359957 100644
--- a/enterprise/ko4j.debugging/build.xml
+++ b/nb/ko4j.debugging/build.xml
@@ -19,7 +19,7 @@
under the License.
-->
-<project basedir="." default="build" name="enterprise/ko4j.debugging">
+<project basedir="." default="build" name="nb/ko4j.debugging">
<description>Builds, tests, and runs the project org.netbeans.modules.ko4j.debugging</description>
<import file="../../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/enterprise/ko4j.debugging/manifest.mf b/nb/ko4j.debugging/manifest.mf
similarity index 82%
rename from enterprise/ko4j.debugging/manifest.mf
rename to nb/ko4j.debugging/manifest.mf
index 5d32a68a2a..23fd2414f6 100644
--- a/enterprise/ko4j.debugging/manifest.mf
+++ b/nb/ko4j.debugging/manifest.mf
@@ -3,4 +3,5 @@ OpenIDE-Module: org.netbeans.modules.ko4j.debugging
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ko4j/debugging/Bundle.properties
OpenIDE-Module-Specification-Version: 1.5
OpenIDE-Module-Needs: org.netbeans.modules.web.browser.api.PageInspector
+OpenIDE-Module-Provides: org.netbeans.modules.ko4j.debugging
diff --git a/enterprise/ko4j.debugging/nbproject/project.properties b/nb/ko4j.debugging/nbproject/project.properties
similarity index 98%
rename from enterprise/ko4j.debugging/nbproject/project.properties
rename to nb/ko4j.debugging/nbproject/project.properties
index 70fcee1f0e..7550355e05 100644
--- a/enterprise/ko4j.debugging/nbproject/project.properties
+++ b/nb/ko4j.debugging/nbproject/project.properties
@@ -14,7 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-is.eager=true
+
+is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/enterprise/ko4j.debugging/nbproject/project.xml b/nb/ko4j.debugging/nbproject/project.xml
similarity index 100%
rename from enterprise/ko4j.debugging/nbproject/project.xml
rename to nb/ko4j.debugging/nbproject/project.xml
diff --git a/enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Bundle.properties b/nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Bundle.properties
similarity index 100%
rename from enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Bundle.properties
rename to nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Bundle.properties
diff --git a/enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/MessageDispatcherImpl.java b/nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/MessageDispatcherImpl.java
similarity index 100%
rename from enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/MessageDispatcherImpl.java
rename to nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/MessageDispatcherImpl.java
diff --git a/enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Server.java b/nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Server.java
similarity index 100%
rename from enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Server.java
rename to nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Server.java
diff --git a/enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Transport.java b/nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Transport.java
similarity index 100%
rename from enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Transport.java
rename to nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/Transport.java
diff --git a/enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/TurnInspectOn.java b/nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/TurnInspectOn.java
similarity index 100%
rename from enterprise/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/TurnInspectOn.java
rename to nb/ko4j.debugging/src/org/netbeans/modules/ko4j/debugging/TurnInspectOn.java
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 9251b7da54..a153ec3a23 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -770,7 +770,6 @@ nb.cluster.enterprise=\
javaee7.api,\
jellytools.enterprise,\
jsp.lexer,\
- ko4j.debugging,\
libs.amazon,\
libs.commons_fileupload,\
libs.elimpl,\
@@ -856,6 +855,7 @@ nb.cluster.nb=\
deadlock.detector,\
ide.branding,\
ide.branding.kit,\
+ ko4j.debugging,\
o.n.upgrader,\
uihandler.exceptionreporter,\
updatecenters,\
diff --git a/webcommon/html.knockout/manifest.mf b/webcommon/html.knockout/manifest.mf
index 2d26de323e..089207f60c 100644
--- a/webcommon/html.knockout/manifest.mf
+++ b/webcommon/html.knockout/manifest.mf
@@ -3,4 +3,5 @@ OpenIDE-Module: org.netbeans.modules.html.knockout
OpenIDE-Module-Layer: org/netbeans/modules/html/knockout/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/knockout/Bundle.properties
OpenIDE-Module-Specification-Version: 1.13
+OpenIDE-Module-Provides: org.netbeans.modules.ko4j.editing
diff --git a/webcommon/html.knockout/nbproject/project.properties b/webcommon/html.knockout/nbproject/project.properties
index ab06b416c0..ef5aca7438 100644
--- a/webcommon/html.knockout/nbproject/project.properties
+++ b/webcommon/html.knockout/nbproject/project.properties
@@ -14,5 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
+is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/webcommon/javascript2.editor/nbproject/project.properties b/webcommon/javascript2.editor/nbproject/project.properties
index b38e0666df..d0cafa811c 100644
--- a/webcommon/javascript2.editor/nbproject/project.properties
+++ b/webcommon/javascript2.editor/nbproject/project.properties
@@ -14,6 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
+is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
build.compiler=extJavac
diff --git a/webcommon/javascript2.knockout/nbproject/project.properties b/webcommon/javascript2.knockout/nbproject/project.properties
index ab06b416c0..ef5aca7438 100644
--- a/webcommon/javascript2.knockout/nbproject/project.properties
+++ b/webcommon/javascript2.knockout/nbproject/project.properties
@@ -14,5 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
+is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists