Initial commit for the Arquillian containers. #1658

arjantijms · 2017-06-06T13:38:45Z

These are derived from the JBoss GlassFish Arquillian containers.

arjantijms · 2017-06-06T13:39:24Z

Jenkins, would you kindly?

payara-ci · 2017-06-06T15:14:25Z

One or more tests have failed

Pandrex247 · 2017-06-06T15:07:38Z

appserver/extras/arquillian-containers/payara-common/pom.xml

@@ -0,0 +1,51 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"


All pom files need the copyright wall of doom.

Done: a8b36f1

Pandrex247 · 2017-06-06T15:09:33Z

...-common/src/main/java/fish/payara/arquillian/container/payara/CommonPayaraConfiguration.java

+ * 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.


I'm not sure about this license. Other cases of Apache licensed stuff in Payara is done like this (obviously our copyright wouldn't be Oracle):

/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved. * * 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://glassfish.dev.java.net/public/CDDL+GPL_1_1.html * or packager/legal/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 packager/legal/LICENSE.txt. * * GPL Classpath Exception: * 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. * * Modifications: * If applicable, add the following below the License Header, with the fields * enclosed by brackets [] replaced by your own identifying information: * "Portions Copyright [year] [name of copyright owner]" * * Contributor(s): * 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 don't 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. * * * This file incorporates work covered by the following copyright and * permission notice: * * Copyright 2004 The Apache Software Foundation * * Licensed 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. */

Done: 5690447

Pandrex247 · 2017-06-06T15:23:19Z

...payara-common/src/main/java/fish/payara/arquillian/container/payara/CommonPayaraManager.java

+
+    private C configuration;
+
+    private PayaraClient glassFishClient;


Could we not refactor this variable to payaraClient?

Sure, consider it done ;)

Done: c0524ed

Pandrex247 · 2017-06-06T15:27:18Z

...payara-common/src/main/java/fish/payara/arquillian/container/payara/CommonPayaraManager.java

+        }
+
+        // Add the type field (optional, the only valid value is "osgi", other values are ommited)
+        if (this.configuration.getType() != null && "osgi".equals(configuration.getType())) {


Could we make the use of this consistent please?

I love nothing better, a bunch of those were already done, but I clearly missed this one.

Done: d4f229d

Pandrex247 · 2017-06-06T15:29:56Z

...src/main/java/fish/payara/arquillian/container/payara/clientutils/PayaraClientException.java

+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Construct a new instance with the supplied message


You're not supplying a message to this constructor.

Good catch!

Done: cd7a361

Pandrex247 · 2017-06-06T15:52:26Z

...mmon/src/main/java/fish/payara/arquillian/container/payara/clientutils/PayaraClientUtil.java

+
+        return client.target(adminBaseUrl + additionalResourceUrl)
+                     .request(APPLICATION_XML_TYPE)
+                     .header("X-GlassFish-3", "ignore");


Might be worth checking if this header has changed at all

Pandrex247 · 2017-06-06T16:01:13Z

...llian-containers/payara-embedded/src/test/resources/gfconfigs/instanceRoot/config/readme.txt

@@ -0,0 +1 @@
+This directory is meant to be the config directory of a Glassfish instanceRoot. It contains a blank domain.xml file for the purpose of testing.


cough Payara cough

Hey, I went through all readme.txt files and changed it. How did this one slip through? Oh well.

Weird, I changed it earlier, but changes got lost.

Done: 48e2689

Pandrex247 · 2017-06-06T16:01:33Z

...llian-containers/payara-embedded/src/test/resources/gfconfigs/instanceRoot/config/domain.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is an empty Glassfish domain config file for representative purposes. -->


payara not glassfish

Done: 48e2689

Pandrex247 · 2017-06-06T16:02:31Z

...llian-containers/payara-embedded/src/test/resources/gfconfigs/installRoot/domains/readme.txt

@@ -0,0 +1 @@
+This directory is meant to be the Glassfish domains directory in an installRoot. It need not have any sub-directories for the purpose of testing.


payara, not glassfish

Done: 48e2689

Pandrex247 · 2017-06-06T16:02:39Z

...rquillian-containers/payara-embedded/src/test/resources/gfconfigs/installRoot/lib/readme.txt

@@ -0,0 +1 @@
+This directory is meant to be the Glassfish lib directory in an installRoot. It need not have any sub-directories for the purpose of testing.


Done: 48e2689

smillidge · 2017-06-12T15:36:21Z

Also update https://github.com/payara/Payara/blob/master/appserver/packager/legal/src/main/resources/glassfish/legal/PAYARA-3RD-PARTY-LICENSE.txt

…llianContainer

lprimak · 2017-06-15T20:45:54Z

jenkins test please

payara-ci · 2017-06-15T22:29:11Z

One or more tests have failed

mulderbaba · 2017-06-16T07:24:50Z

jenkins test please

arjantijms · 2017-06-16T08:29:00Z

jenkins test please

payara-ci · 2017-06-16T09:46:21Z

All tests have passed

payara-ci · 2017-06-16T12:43:24Z

One or more tests have failed

arjantijms · 2017-06-19T17:06:35Z

Jenkins, would you kindly?

payara-ci · 2017-06-19T17:56:26Z

All tests have passed

Initial commit for the Arquillian containers.

64e56f2

These are derived from the JBoss GlassFish Arquillian containers.

arjantijms requested a review from Pandrex247 June 6, 2017 13:38

fturizo added the 3:DevInProgress label Jun 6, 2017

Updated artefactId and version of Arquillian containers

8f688e8

Pandrex247 reviewed Jun 6, 2017

View reviewed changes

arjantijms added 10 commits June 6, 2017 18:29

GlassFishClient to PayaraClient renaming

c0524ed

Remove needless "this." prefix.

d4f229d

Fixed wrong Javadoc and applied formatting

cd7a361

Fixed Javadoc copy/paste error

df93e1a

Corrected typo and simplified code while at it

a44c2db

Renamed GlassFish to Payara, again.

48e2689

Updated license headers for .java files

5690447

Updated license headers of pom files

a8b36f1

Added javadoc and source generation and fixed javadoc errors

89f3f6b

Fixed bug wrt passing domain argument

f27ba5d

arjantijms requested a review from smillidge June 12, 2017 11:03

arjantijms added 2 commits June 13, 2017 19:26

Merge remote-tracking branch 'upstream/master' into PAYARA-1724-Arqui…

40a7111

…llianContainer

Added attribution for JBoss to 3rd party license text file

057379f

smillidge approved these changes Jun 19, 2017

View reviewed changes

arjantijms merged commit 7cd7c7c into payara:master Jun 20, 2017

fturizo removed the 3:DevInProgress label Jun 20, 2017

arjantijms deleted the PAYARA-1724-ArquillianContainer branch June 20, 2017 10:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial commit for the Arquillian containers. #1658

Initial commit for the Arquillian containers. #1658

arjantijms commented Jun 6, 2017

arjantijms commented Jun 6, 2017

payara-ci commented Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 8, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 8, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

arjantijms Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

arjantijms Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

Pandrex247 Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

arjantijms Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

Pandrex247 Jun 6, 2017

arjantijms Jun 6, 2017

smillidge commented Jun 12, 2017

lprimak commented Jun 15, 2017

payara-ci commented Jun 15, 2017

mulderbaba commented Jun 16, 2017

arjantijms commented Jun 16, 2017

payara-ci commented Jun 16, 2017

payara-ci commented Jun 16, 2017

arjantijms commented Jun 19, 2017

payara-ci commented Jun 19, 2017

		@@ -0,0 +1,51 @@
		<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"


		private C configuration;

		private PayaraClient glassFishClient;

		@@ -0,0 +1 @@
		This directory is meant to be the config directory of a Glassfish instanceRoot. It contains a blank domain.xml file for the purpose of testing.

		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<!-- This is an empty Glassfish domain config file for representative purposes. -->

		@@ -0,0 +1 @@
		This directory is meant to be the Glassfish domains directory in an installRoot. It need not have any sub-directories for the purpose of testing.

Initial commit for the Arquillian containers. #1658

Initial commit for the Arquillian containers. #1658

Conversation

arjantijms commented Jun 6, 2017

arjantijms commented Jun 6, 2017

payara-ci commented Jun 6, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smillidge commented Jun 12, 2017

lprimak commented Jun 15, 2017

payara-ci commented Jun 15, 2017

mulderbaba commented Jun 16, 2017

arjantijms commented Jun 16, 2017

payara-ci commented Jun 16, 2017

payara-ci commented Jun 16, 2017

arjantijms commented Jun 19, 2017

payara-ci commented Jun 19, 2017