Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial commit for the Arquillian containers. #1658

Merged
merged 14 commits into from Jun 20, 2017

Conversation

Projects
None yet
7 participants
@arjantijms
Copy link
Member

commented Jun 6, 2017

These are derived from the JBoss GlassFish Arquillian containers.

Initial commit for the Arquillian containers.
These are derived from the JBoss GlassFish Arquillian containers.

@arjantijms arjantijms requested a review from Pandrex247 Jun 6, 2017

@arjantijms

This comment has been minimized.

Copy link
Member Author

commented Jun 6, 2017

Jenkins, would you kindly?

@payara-ci

This comment has been minimized.

Copy link
Contributor

commented Jun 6, 2017

One or more tests have failed

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

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

All pom files need the copyright wall of doom.

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 8, 2017

Author Member

Done: a8b36f1

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

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

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

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 8, 2017

Author Member

Done: 5690447


private C configuration;

private PayaraClient glassFishClient;

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

Could we not refactor this variable to payaraClient?

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Sure, consider it done ;)

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Done: c0524ed

}

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

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

Could we make the use of this consistent please?

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

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

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Done: d4f229d

private static final long serialVersionUID = 1L;

/**
* Construct a new instance with the supplied message

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

You're not supplying a message to this constructor.

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Good catch!

Done: cd7a361


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

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

Might be worth checking if this header has changed at all

@@ -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.

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

cough Payara cough

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

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

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

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

Done: 48e2689

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

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

payara not glassfish

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Done: 48e2689

@@ -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.

This comment has been minimized.

Copy link
@Pandrex247

Pandrex247 Jun 6, 2017

Member

payara, not glassfish

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Done: 48e2689

@@ -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.

This comment has been minimized.

Copy link
@Pandrex247

This comment has been minimized.

Copy link
@arjantijms

arjantijms Jun 6, 2017

Author Member

Done: 48e2689

@arjantijms arjantijms requested a review from smillidge Jun 12, 2017

@lprimak

This comment has been minimized.

Copy link
Contributor

commented Jun 15, 2017

jenkins test please

@payara-ci

This comment has been minimized.

Copy link
Contributor

commented Jun 15, 2017

One or more tests have failed

@mulderbaba

This comment has been minimized.

Copy link
Contributor

commented Jun 16, 2017

jenkins test please

1 similar comment
@arjantijms

This comment has been minimized.

Copy link
Member Author

commented Jun 16, 2017

jenkins test please

@payara-ci

This comment has been minimized.

Copy link
Contributor

commented Jun 16, 2017

All tests have passed

@payara-ci

This comment has been minimized.

Copy link
Contributor

commented Jun 16, 2017

One or more tests have failed

@arjantijms

This comment has been minimized.

Copy link
Member Author

commented Jun 19, 2017

Jenkins, would you kindly?

@payara-ci

This comment has been minimized.

Copy link
Contributor

commented Jun 19, 2017

All tests have passed

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

3 checks passed

JDK7 Ubuntu Builder JDK7 Build Passed.
Details
JDK7 Ubuntu Tester JDK7 tests passed.
Details
Jenkins Job Handler All builds and tests successfully completed.
Details

@arjantijms arjantijms deleted the arjantijms:PAYARA-1724-ArquillianContainer branch Jun 20, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.