This is an automated email from the ASF dual-hosted git repository.
junichi11 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 80df40f [NETBEANS-1074] Module Review glassfish.tooling (#818)
80df40f is described below
commit 80df40f8d649ae3df795b57d4e4da961b5a620d0
Author: Josh Juneau <[email protected]>
AuthorDate: Thu Aug 30 22:03:23 2018 -0500
[NETBEANS-1074] Module Review glassfish.tooling (#818)
- No external libraries
- Checked Rat report: everything now licensed to Apache
- Skimmed module...no additional problems found
- Added licenseinfo.xml to capture licensing for included json files
---
glassfish.tooling/licenseinfo.xml | 29 ++++++++++++
.../glassfish/tooling/GlassFish.properties-dist | 16 +++++++
.../tooling/GlassFishHttp.properties-dist | 16 +++++++
.../tooling/GlassFishRest.properties-dist | 16 +++++++
.../modules/glassfish/tooling/Java.properties-dist | 16 +++++++
.../tooling/admin/response/list-jdbc-resources.xml | 22 ++++++++-
.../glassfish/tooling/admin/response/version.xml | 22 ++++++++-
.../tooling/data/GlassFishVersionTest.java | 55 +++++++---------------
8 files changed, 152 insertions(+), 40 deletions(-)
diff --git a/glassfish.tooling/licenseinfo.xml
b/glassfish.tooling/licenseinfo.xml
new file mode 100644
index 0000000..7d1ecbc
--- /dev/null
+++ b/glassfish.tooling/licenseinfo.xml
@@ -0,0 +1,29 @@
+<?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>test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.json</file>
+
<file>test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/location.json</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
index 4b51df2..09cf219 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFish.properties-dist
@@ -1,3 +1,19 @@
+# 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.
host=localhost
adminUser=admin
adminPassword=admin123
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
index 8248675..dfec5dc 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishHttp.properties-dist
@@ -1,3 +1,19 @@
+# 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.
name=GlassFish Server 3.1.2.2
serverHome=/users/tomas/WS/gfr3122/glassfish
domainsFolder=/users/tomas/WS/gfr3122/glassfish/domains
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
index 486da9f..cf65a3e 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/GlassFishRest.properties-dist
@@ -1,3 +1,19 @@
+# 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.
name=GlassFish Server 4
serverHome=/users/tomas/WS/gf4/glassfish
domainsFolder=/users/tomas/WS/gf4/glassfish/domains
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
index b6e761b..398f396 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/Java.properties-dist
@@ -1 +1,17 @@
+# 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.
javaHome=/usr/jdk/jdk1.7.0_15
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
index a3564d3..15df7d0 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/list-jdbc-resources.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
<map>
<entry key="extraProperties">
<map>
@@ -50,4 +70,4 @@
</map>
</list>
</entry>
-</map>
\ No newline at end of file
+</map>
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
index c9b3791..0a5916c 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/response/version.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+ 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.
+
+-->
<map>
<entry key="extraProperties">
<map>
@@ -28,4 +48,4 @@
<entry key="message" value="GlassFish Server Open Source Edition 3.1.1
(build 12)"/>
<entry key="exit_code" value="SUCCESS"/>
<entry key="command" value="version AdminCommand"/>
-</map>
\ No newline at end of file
+</map>
diff --git
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
index db88cc7..3ac43d8 100644
---
a/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
+++
b/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java
@@ -1,41 +1,20 @@
/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ * 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
*
- * Copyright 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * https://java.net/projects/gf-tooling/pages/License or LICENSE.TXT.
- * See the License for the specific language governing permissions
- * and limitations under the License. When distributing the software,
- * include this License Header Notice in each file and include the License
- * file at LICENSE.TXT. Oracle designates this particular file as subject
- * to the "Classpath" exception as provided by Oracle in the GPL Version 2
- * section of the License file that accompanied this code. If applicable,
- * add the following below the License Header, with the fields enclosed
- * by brackets [] replaced by your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2008 Sun Microsystems, Inc.
+ * 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 org.netbeans.modules.glassfish.tooling.data;
@@ -81,7 +60,7 @@ public class GlassFishVersionTest {
assertTrue(version.toString() != null);
}
}
-
+
/**
* Test that <code>toValue</code> handles all <code>enum</code> values
* and that sequence of <code>toString</code> and <code>toValue</code>
@@ -140,7 +119,7 @@ public class GlassFishVersionTest {
assertTrue(versions[i].equals(version));
}
}
-
+
/**
* Verify <code>toFullString</code> method.
*/
@@ -165,7 +144,7 @@ public class GlassFishVersionTest {
} catch (NumberFormatException nfe) {
fail("Could not parse version number");
}
-
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
