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/09 19:04:22 UTC
[GitHub] asfgit closed pull request #838: Module Review html.angular
asfgit closed pull request #838: Module Review html.angular
URL: https://github.com/apache/incubator-netbeans/pull/838
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/html.angular/.gitignore b/html.angular/.gitignore
new file mode 100644
index 0000000000..c1842eca6f
--- /dev/null
+++ b/html.angular/.gitignore
@@ -0,0 +1 @@
+test/unit/data/angularTestProject/public_html/js/angular.js
diff --git a/html.angular/build.xml b/html.angular/build.xml
index 806b4e7b36..ab9b0ba2b3 100644
--- a/html.angular/build.xml
+++ b/html.angular/build.xml
@@ -24,6 +24,12 @@
<import file="../nbbuild/templates/projectized.xml"/>
<target name="build-init" depends="projectized.build-init">
- <unzip src="external/html.angular-angularjs-resources.zip" dest="."/>
+ <mkdir dir="test/unit/data/angularTestProject/public_html/js"/>
+ <unzip src="external/angularjs-1.0.6.jar" dest="test/unit/data/angularTestProject/public_html/js/">
+ <patternset>
+ <include name="META-INF/resources/webjars/angularjs/1.0.6/angular.js"/>
+ </patternset>
+ <flattenmapper/>
+ </unzip>
</target>
</project>
diff --git a/html.angular/external/html.angular-angularjs-license.txt b/html.angular/external/angularjs-1.0.6-license.txt
similarity index 88%
rename from html.angular/external/html.angular-angularjs-license.txt
rename to html.angular/external/angularjs-1.0.6-license.txt
index 7dc1a4fd94..de4c8d571f 100644
--- a/html.angular/external/html.angular-angularjs-license.txt
+++ b/html.angular/external/angularjs-1.0.6-license.txt
@@ -1,3 +1,10 @@
+Name: AngularJS
+Version: 1.0.6
+Description: AngularJS source that serve as test data
+License: MIT
+Origin: https://angularjs.org/
+Type: compile-time
+
The MIT License
Copyright (c) 2014-2016 Google, Inc. http://angularjs.org
diff --git a/html.angular/external/binaries-list b/html.angular/external/binaries-list
index b0cd061df4..4dbddf424e 100644
--- a/html.angular/external/binaries-list
+++ b/html.angular/external/binaries-list
@@ -1 +1,17 @@
-52E34C4B8CA61339AADCB7463495C6EA5EEB553B html.angular-angularjs-resources.zip
+# 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.
+9F07F7A769E11D51FAC3642C48FB78D65B478948 org.webjars:angularjs:1.0.6
diff --git a/html.angular/licenseinfo.xml b/html.angular/licenseinfo.xml
new file mode 100644
index 0000000000..56e500a1b2
--- /dev/null
+++ b/html.angular/licenseinfo.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/modules/html/angular/model/resources/angular-1.3.3.model</file>
+ <file>src/org/netbeans/modules/html/angular/model/resources/angular-1.3.6.model</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
----------------------------------------------------------------
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