You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2018/12/10 14:47:38 UTC

[35/38] tomee git commit: TOMEE-2247 - Removed unneeded Arquillian packager. Issue was resolved in new TCK version.

TOMEE-2247 - Removed unneeded Arquillian packager. Issue was resolved in new TCK version.


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/611ca291
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/611ca291
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/611ca291

Branch: refs/heads/master
Commit: 611ca29169b977899b703b2fb52c712a0fffd2af
Parents: 9aa994e
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Tue Dec 4 18:56:23 2018 +0000
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Fri Dec 7 18:13:06 2018 +0000

----------------------------------------------------------------------
 .../MicroProfileJWTTCKDeploymentPackager.java   | 40 --------------------
 .../tck/jwt/MicroProfileJWTTCKExtension.java    |  3 --
 .../tck/jwt/MicroProfileJWTTCKProtocol.java     | 27 -------------
 3 files changed, 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/611ca291/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKDeploymentPackager.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKDeploymentPackager.java b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKDeploymentPackager.java
deleted file mode 100644
index 20a3c94..0000000
--- a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKDeploymentPackager.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tomee.microprofile.tck.jwt;
-
-import org.jboss.arquillian.container.test.spi.TestDeployment;
-import org.jboss.arquillian.container.test.spi.client.deployment.ProtocolArchiveProcessor;
-import org.jboss.arquillian.protocol.servlet.v_2_5.ServletProtocolDeploymentPackager;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-
-import java.util.Collection;
-
-public class MicroProfileJWTTCKDeploymentPackager extends ServletProtocolDeploymentPackager {
-    @Override
-    public Archive<?> generateDeployment(final TestDeployment testDeployment,
-                                         final Collection<ProtocolArchiveProcessor> processors) {
-
-        // Some tests on the TCK use duplicate war names. This is to use the unique id generated by Arquillian.
-        final WebArchive webArchive = ShrinkWrap.create(WebArchive.class)
-                                                .merge(testDeployment.getApplicationArchive());
-
-        return super.generateDeployment(
-                new TestDeployment(null, webArchive, testDeployment.getAuxiliaryArchives()), processors);
-    }
-}

http://git-wip-us.apache.org/repos/asf/tomee/blob/611ca291/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKExtension.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKExtension.java b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKExtension.java
index 2a2ec26..926b119 100644
--- a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKExtension.java
+++ b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKExtension.java
@@ -17,15 +17,12 @@
 package org.apache.tomee.microprofile.tck.jwt;
 
 import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
-import org.jboss.arquillian.container.test.spi.client.protocol.Protocol;
 import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.jboss.arquillian.protocol.servlet.v_2_5.ServletProtocol;
 
 public class MicroProfileJWTTCKExtension implements LoadableExtension {
     @Override
     public void register(final ExtensionBuilder extensionBuilder) {
         extensionBuilder
-                .override(Protocol.class, ServletProtocol.class, MicroProfileJWTTCKProtocol.class)
                 .service(ApplicationArchiveProcessor.class, MicroProfileJWTTCKArchiveProcessor.class)
         ;
     }

http://git-wip-us.apache.org/repos/asf/tomee/blob/611ca291/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKProtocol.java
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKProtocol.java b/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKProtocol.java
deleted file mode 100644
index c3650b6..0000000
--- a/tck/microprofile-tck/jwt/src/test/java/org/apache/tomee/microprofile/tck/jwt/MicroProfileJWTTCKProtocol.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tomee.microprofile.tck.jwt;
-
-import org.jboss.arquillian.container.test.spi.client.deployment.DeploymentPackager;
-import org.jboss.arquillian.protocol.servlet.v_2_5.ServletProtocol;
-
-public class MicroProfileJWTTCKProtocol extends ServletProtocol {
-    @Override
-    public DeploymentPackager getPackager() {
-        return new MicroProfileJWTTCKDeploymentPackager();
-    }
-}