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/08/31 03:03:24 UTC
[GitHub] junichi11 closed pull request #818: [NETBEANS-1074] Module review
glassfish.tooling
junichi11 closed pull request #818: [NETBEANS-1074] Module review glassfish.tooling
URL: https://github.com/apache/incubator-netbeans/pull/818
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/glassfish.tooling/licenseinfo.xml b/glassfish.tooling/licenseinfo.xml
new file mode 100644
index 0000000000..7d1ecbc2df
--- /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 4b51df2ad4..09cf219ea6 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 8248675cd3..dfec5dc244 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 486da9fa3c..cf65a3eacb 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 b6e761b140..398f3961d8 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 a3564d3099..15df7d05aa 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 c9b37919e1..0a5916c8ef 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 db88cc7808..3ac43d8ddb 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 void testToString() {
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 void testToValueIncomplete() {
assertTrue(versions[i].equals(version));
}
}
-
+
/**
* Verify <code>toFullString</code> method.
*/
@@ -165,7 +144,7 @@ public void testToFullString() {
} catch (NumberFormatException nfe) {
fail("Could not parse version number");
}
-
+
}
}
----------------------------------------------------------------
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