forked from arquillian/arquillian-extension-liferay
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request csierra/arquillian-extension-liferay#20 fixes #8
- Loading branch information
Carlos Sierra
committed
Apr 15, 2015
1 parent
41efd4a
commit 2fc2f26
Showing
25 changed files
with
919 additions
and
746 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <artifactId>arquillian-extension-liferay</artifactId> | ||
| <groupId>org.arquillian.liferay</groupId> | ||
| <version>1.0.0.Final-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
|
|
||
| <groupId>org.arquillian.liferay</groupId> | ||
| <artifactId>arquillian-container-osgi-with-extensions</artifactId> | ||
| <version>1.0.0.Final-SNAPSHOT</version> | ||
| <name>Arquillian Liferay Container Adapter</name> | ||
| <description>Arquillian Container OSGi that allow to use standars extensions</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>biz.aQute.bnd</groupId> | ||
| <artifactId>bndlib</artifactId> | ||
| <version>2.4.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.12</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.jboss.arquillian.container</groupId> | ||
| <artifactId>arquillian-container-karaf-remote</artifactId> | ||
| <version>2.1.0.CR18</version> | ||
| <exclusions> | ||
| <exclusion> | ||
| <groupId>org.jboss.arquillian.junit</groupId> | ||
| <artifactId>arquillian-junit-container</artifactId> | ||
| </exclusion> | ||
| </exclusions> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.osgi</groupId> | ||
| <artifactId>org.osgi.core</artifactId> | ||
| <version>5.0.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.osgi</groupId> | ||
| <artifactId>org.osgi.enterprise</artifactId> | ||
| <version>5.0.0</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| </project> |
47 changes: 47 additions & 0 deletions
47
...ava/org/arquillian/container/osgi/remote/KarafWithoutBundleRemoteDeployableContainer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * Copyright (c) 2000-present Liferay, Inc. All rights reserved. | ||
| * | ||
| * This library is free software; you can redistribute it and/or modify it under | ||
| * the terms of the GNU Lesser General Public License as published by the Free | ||
| * Software Foundation; either version 2.1 of the License, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more | ||
| * details. | ||
| */ | ||
|
|
||
| package org.arquillian.container.osgi.remote; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| import org.jboss.arquillian.container.osgi.karaf.remote.KarafRemoteContainerConfiguration; | ||
| import org.jboss.arquillian.container.osgi.karaf.remote.KarafRemoteDeployableContainer; | ||
| import org.jboss.arquillian.container.spi.client.container.LifecycleException; | ||
|
|
||
| /** | ||
| * @author Cristina González | ||
| */ | ||
| public class KarafWithoutBundleRemoteDeployableContainer | ||
| <T extends KarafRemoteContainerConfiguration> | ||
| extends KarafRemoteDeployableContainer<T> { | ||
|
|
||
| @Override | ||
| protected void awaitArquillianBundleActive(long timeout, TimeUnit unit) | ||
| throws InterruptedException, IOException, TimeoutException { | ||
|
|
||
| //On purpose: It is not needed to install an Arquillian Bundle | ||
| } | ||
|
|
||
| @Override | ||
| protected void installArquillianBundle() | ||
| throws IOException, LifecycleException { | ||
|
|
||
| //On purpose: It is not needed to install an Arquillian Bundle | ||
| } | ||
|
|
||
| } |
46 changes: 46 additions & 0 deletions
46
...tensions/src/main/java/org/arquillian/container/osgi/remote/OSGiAllInBundleExtension.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /** | ||
| * Copyright (c) 2000-present Liferay, Inc. All rights reserved. | ||
| * | ||
| * This library is free software; you can redistribute it and/or modify it under | ||
| * the terms of the GNU Lesser General Public License as published by the Free | ||
| * Software Foundation; either version 2.1 of the License, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more | ||
| * details. | ||
| */ | ||
|
|
||
| package org.arquillian.container.osgi.remote; | ||
|
|
||
| import org.arquillian.container.osgi.remote.bundleclasspath.BundleClassPathAuxiliaryAppender; | ||
| import org.arquillian.container.osgi.remote.processor.AddAllExtensionsToApplicationArchiveProcessor; | ||
|
|
||
| import org.jboss.arquillian.container.osgi.karaf.remote.KarafRemoteDeployableContainer; | ||
| import org.jboss.arquillian.container.spi.client.container.DeployableContainer; | ||
| import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; | ||
| import org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender; | ||
| import org.jboss.arquillian.core.spi.LoadableExtension; | ||
|
|
||
| /** | ||
| * @author Cristina González | ||
| */ | ||
| public class OSGiAllInBundleExtension implements LoadableExtension { | ||
|
|
||
| @Override | ||
| public void register(ExtensionBuilder builder) { | ||
| builder.override( | ||
| DeployableContainer.class, KarafRemoteDeployableContainer.class, | ||
| KarafWithoutBundleRemoteDeployableContainer.class); | ||
|
|
||
| builder.service( | ||
| ApplicationArchiveProcessor.class, | ||
| AddAllExtensionsToApplicationArchiveProcessor.class); | ||
|
|
||
| builder.service( | ||
| AuxiliaryArchiveAppender.class, | ||
| BundleClassPathAuxiliaryAppender.class); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...ions/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| org.arquillian.container.osgi.remote.OSGiWithExtensionsExtension |
Oops, something went wrong.