You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2018/09/09 19:04:12 UTC
[incubator-netbeans] branch master updated: Module Review
html.angular
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9db4ea9 Module Review html.angular
9db4ea9 is described below
commit 9db4ea989115bef0306e9397bfa33073e749174a
Author: Svata Dedic <sv...@oracle.com>
AuthorDate: Tue Sep 4 10:07:59 2018 +0200
Module Review html.angular
Closes: #838
---
html.angular/.gitignore | 1 +
html.angular/build.xml | 8 +++++++-
...gularjs-license.txt => angularjs-1.0.6-license.txt} | 7 +++++++
html.angular/external/binaries-list | 18 +++++++++++++++++-
html.angular/{build.xml => licenseinfo.xml} | 16 ++++++++--------
5 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/html.angular/.gitignore b/html.angular/.gitignore
new file mode 100644
index 0000000..c1842ec
--- /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 806b4e7..ab9b0ba 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 7dc1a4f..de4c8d5 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 b0cd061..4dbddf4 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/build.xml b/html.angular/licenseinfo.xml
similarity index 68%
copy from html.angular/build.xml
copy to html.angular/licenseinfo.xml
index 806b4e7..86f1634 100644
--- a/html.angular/build.xml
+++ b/html.angular/licenseinfo.xml
@@ -19,11 +19,11 @@
under the License.
-->
-<project basedir="." default="netbeans" name="html.angular">
- <description>Builds, tests, and runs the project org.netbeans.modules.html.angular</description>
- <import file="../nbbuild/templates/projectized.xml"/>
-
- <target name="build-init" depends="projectized.build-init">
- <unzip src="external/html.angular-angularjs-resources.zip" dest="."/>
- </target>
-</project>
+<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>
---------------------------------------------------------------------
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