Author: [email protected]
Date: Tue May 1 11:32:36 2012
New Revision: 2294
Log:
[AMDATUAUTH-113] Fixed wrapped bundle dependencies
Modified:
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthBundles.java
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java
Modified:
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthBundles.java
==============================================================================
---
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthBundles.java
(original)
+++
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthBundles.java
Tue May 1 11:32:36 2012
@@ -16,6 +16,7 @@
package org.amdatu.auth.test.integration.base;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
import org.amdatu.itest.base.Fixture;
import org.amdatu.itest.base.ProvisionedBundle;
@@ -33,87 +34,88 @@
/**
* Commons HTTP client.
*/
- COMMONS_HTTP_CLIENT("commons-httpclient", "commons-httpclient", null,
false),
+ COMMONS_HTTP_CLIENT("commons-httpclient", "commons-httpclient", null,
false, true),
/**
* Commons codec.
*/
- COMMONS_CODEC("commons-codec", "commons-codec", null, false),
+ COMMONS_CODEC("commons-codec", "commons-codec", null, false, true),
/**
* Commons logging.
*/
- COMMONS_LOGGING("commons-logging", "commons-logging", null, false),
+ COMMONS_LOGGING("commons-logging", "commons-logging", null, false,
true),
/**
* JSON.
*/
- JSON("org.json", "json", null, false),
+ JSON("org.json", "json", null, false, true),
/**
* Auth itest tools.
*/
- ITEST_TOOLS("org.amdatu.auth", "org.amdatu.auth.tools.itest", null,
false),
+ ITEST_TOOLS("org.amdatu.auth", "org.amdatu.auth.tools.itest", null,
false, true),
/**
* Auth itest base.
*/
- ITEST_BASE("org.amdatu.auth", "org.amdatu.auth.test.integration.base",
null, false),
+ ITEST_BASE("org.amdatu.auth", "org.amdatu.auth.test.integration.base",
null, false, false),
/**
* Auth Token Provider.
*/
- TOKEN_PROVIDER("org.amdatu.auth", "org.amdatu.auth.tokenprovider",
null, false),
+ TOKEN_PROVIDER("org.amdatu.auth", "org.amdatu.auth.tokenprovider",
null, false, false),
/**
* Auth in-memory token store.
*/
- TOKEN_STORE_MEM("org.amdatu.auth", "org.amdatu.auth.tokenstore.mem",
null, false),
+ TOKEN_STORE_MEM("org.amdatu.auth", "org.amdatu.auth.tokenstore.mem",
null, false, false),
/**
* OAuth API.
*/
- OAUTH_API("org.amdatu.auth", "org.amdatu.auth.oauth.api", null, false),
+ OAUTH_API("org.amdatu.auth", "org.amdatu.auth.oauth.api", null, false,
false),
/**
* OAuth consumer registry.
*/
- OAUTH_CONSUMER_REGISTRY("org.amdatu.auth",
"org.amdatu.auth.oauth.consumerregistry", null, false),
+ OAUTH_CONSUMER_REGISTRY("org.amdatu.auth",
"org.amdatu.auth.oauth.consumerregistry", null, false, false),
/**
* OAuth client.
*/
- OAUTH_CLIENT("org.amdatu.auth", "org.amdatu.auth.oauth.client", null,
false),
+ OAUTH_CLIENT("org.amdatu.auth", "org.amdatu.auth.oauth.client", null,
false, false),
/**
* OAuth sever.
*/
- OAUTH_SERVER("org.amdatu.auth", "org.amdatu.auth.oauth.server", null,
false),
+ OAUTH_SERVER("org.amdatu.auth", "org.amdatu.auth.oauth.server", null,
false, false),
/**
* OAuth in-memoery nonce store.
*/
- OAUTH_STORE_NONCE_MEM("org.amdatu.auth",
"org.amdatu.auth.oauth.store.nonce.mem", null, false),
+ OAUTH_STORE_NONCE_MEM("org.amdatu.auth",
"org.amdatu.auth.oauth.store.nonce.mem", null, false, false),
/**
* OAuth FS consumer store.
*/
- OAUTH_STORE_CONSUMER_FS("org.amdatu.auth",
"org.amdatu.auth.oauth.store.consumer.fs", null, false),
+ OAUTH_STORE_CONSUMER_FS("org.amdatu.auth",
"org.amdatu.auth.oauth.store.consumer.fs", null, false, false),
/**
* Login service.
*/
- LOGIN_SERVICE("org.amdatu.auth", "org.amdatu.auth.login.service",
null, false),
+ LOGIN_SERVICE("org.amdatu.auth", "org.amdatu.auth.login.service",
null, false, false),
/**
* User Admin REST service.
*/
- USERADMIN_REST("org.amdatu.auth", "org.amdatu.auth.useradmin.rest",
null, false);
+ USERADMIN_REST("org.amdatu.auth", "org.amdatu.auth.useradmin.rest",
null, false, false);
private final String m_groupId;
private final String m_artifactId;
private final String m_version;
private final boolean m_addCoverageClassifier;
+ private final boolean m_isLibrary;
/**
* Creates a new {@link AuthBundles} instance with a given group and
artifact-ID.
@@ -122,11 +124,12 @@
* @param artifactId the Maven artifact ID of the bundle.
*/
private AuthBundles(final String groupId, final String artifactId,
- final String version, final boolean addCoverageClassifier) {
+ final String version, final boolean addCoverageClassifier, final
boolean isLibrary) {
m_groupId = groupId;
m_artifactId = artifactId;
m_version = version;
m_addCoverageClassifier = addCoverageClassifier;
+ m_isLibrary = isLibrary;
}
/**
@@ -158,12 +161,26 @@
public ProvisionOption<?> getProvisionOption() {
ProvisionOption<?> option = null;
if (m_version != null) {
- option =
-
mavenBundle().groupId(m_groupId).artifactId(m_artifactId).version(m_version).start(false);
+ if (m_isLibrary) {
+ option =
+
wrappedBundle(mavenBundle().groupId(m_groupId).artifactId(m_artifactId).version(m_version)
+ .start(false));
+ }
+ else {
+ option =
+
mavenBundle().groupId(m_groupId).artifactId(m_artifactId).version(m_version).start(false);
+ }
}
else {
- option =
-
mavenBundle().groupId(m_groupId).artifactId(m_artifactId).versionAsInProject().start(false);
+ if (m_isLibrary) {
+ option =
+
wrappedBundle(mavenBundle().groupId(m_groupId).artifactId(m_artifactId).versionAsInProject()
+ .start(false));
+ }
+ else {
+ option =
+
mavenBundle().groupId(m_groupId).artifactId(m_artifactId).versionAsInProject().start(false);
+ }
}
if (m_addCoverageClassifier) {
option = new UrlProvisionOption(option.getURL() + "//" +
Fixture.getCoverageClassifier());
Modified:
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
==============================================================================
---
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
(original)
+++
trunk/amdatu-auth/test-integration/base/src/main/java/org/amdatu/auth/test/integration/base/AuthConfigs.java
Tue May 1 11:32:36 2012
@@ -32,6 +32,7 @@
import java.util.List;
import java.util.Properties;
+@SuppressWarnings("deprecation")
public enum AuthConfigs implements ProvisionedConfig {
/**
* OAuth server config.
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/launcher/AuthTest.java
Tue May 1 11:32:36 2012
@@ -111,7 +111,7 @@
}
@Test
- public void runTest(final BundleContext bundleContext) throws Exception {
+ public void runTest() throws Exception {
// Create the dependency manager
m_dependencyManager = new
DependencyManager(m_testContext.getBundleContext());
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
