Author: [email protected]
Date: Fri May 13 15:00:19 2011
New Revision: 1138
Log:
[AMDATUAUTH-23] Removed oauth integration tests (these are moved to Amdatu Auth)
Removed:
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/OAuthTestBase.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/mock/OAuthProtectedTestServlet.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/mock/OAuthTestConsumer.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/tests/OAuthServiceConsumerRegistryTest.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/tests/OAuthSignedRequestsTest.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/tests/OAuthThreeLeggedTest.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/tests/OAuthTwoLeggedTest.java
Modified:
trunk/integration-tests/pom.xml
trunk/integration-tests/test-platform/pom.xml
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Fri May 13 15:00:19 2011
@@ -4,7 +4,7 @@
<parent>
<groupId>org.amdatu</groupId>
<artifactId>amdatu</artifactId>
- <version>1</version>
+ <version>2</version>
<relativePath>../amdatu-parent/pom.xml</relativePath>
</parent>
<groupId>org.amdatu</groupId>
Modified: trunk/integration-tests/test-platform/pom.xml
==============================================================================
--- trunk/integration-tests/test-platform/pom.xml (original)
+++ trunk/integration-tests/test-platform/pom.xml Fri May 13 15:00:19 2011
@@ -112,34 +112,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.application</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.listener</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.useradminstore</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.core</groupId>
<artifactId>useradminstore-fs</artifactId>
<version>${project.version}</version>
@@ -203,13 +175,6 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.gadgetstore</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
<version>${project.version}</version>
@@ -225,34 +190,6 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.client</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.consumerregistry-fs</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified:
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
==============================================================================
---
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
(original)
+++
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
Fri May 13 15:00:19 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu 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
@@ -37,7 +37,7 @@
/**
* This class provides the configurations for the bundles under test.
- *
+ *
* @author ivol
*/
public class ConfigProvider {
@@ -70,7 +70,7 @@
properties.put("tenant1.properties.hostname", "localhost");
config.update(properties);
}
-
+
public void addCassandraConfig(ConfigurationAdmin configAdmin) throws
IOException {
Configuration config =
configAdmin.getConfiguration(CassandraConfigurationService.PID, null);
Properties properties = new Properties();
@@ -206,15 +206,6 @@
config.update(properties);
}
- public void addOAuthConfig(ConfigurationAdmin configAdmin) throws
IOException {
- Configuration config =
configAdmin.getConfiguration(OAuthServerConfig.PID, null);
- Properties properties = new Properties();
- properties.put(OAuthServerConfig.HOSTNAME, ConfigProvider.HOSTNAME);
- properties.put(OAuthServerConfig.PORTNR, ConfigProvider.PORTNR);
- properties.put(OAuthServerConfig.AUTHORIZE_URL,
"/oauth-server/jsp/authorize.jsp");
- config.update(properties);
- }
-
@SuppressWarnings("unchecked")
public void addTestUser(UserAdmin userAdmin) {
User user = (User) userAdmin.createRole(TEST_USERNAME, Role.USER);
@@ -229,7 +220,7 @@
/**
* Wait until the service at the specified URL returns the specified
response code with a timeout as specified.
- *
+ *
* @throws IOException
*/
public static boolean waitForURL(URL url, int responseCode, int timeout)
throws IOException {
@@ -249,7 +240,7 @@
/**
* Invokes a URL and returns the response code.
- *
+ *
* @throws IOException
*/
public static int checkURL(URL url) throws IOException {
Modified:
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/test-platform/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Fri May 13 15:00:19 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu 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
@@ -319,7 +319,7 @@
protected static MavenArtifactProvisionOption
amdatuUserAdminCassandraStore() {
return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("useradminstore").versionAsInProject();
}
-
+
protected static MavenArtifactProvisionOption amdatuGadgetCassandraStore()
{
return
mavenBundle().groupId("org.amdatu.cassandra").artifactId("gadgetstore").versionAsInProject();
}
@@ -376,23 +376,6 @@
return
mavenBundle().groupId("org.amdatu.authentication.tokenstore").artifactId("mem").versionAsInProject();
}
- protected static MavenArtifactProvisionOption amdatuOAuthAPI() {
- return
mavenBundle().groupId("org.amdatu.authentication.oauth").artifactId("api").versionAsInProject();
- }
-
- protected static MavenArtifactProvisionOption amdatuOAuthClient() {
- return
mavenBundle().groupId("org.amdatu.authentication.oauth").artifactId("client").versionAsInProject();
- }
-
- protected static MavenArtifactProvisionOption amdatuOAuthServer() {
- return
mavenBundle().groupId("org.amdatu.authentication.oauth").artifactId("server").versionAsInProject();
- }
-
- protected static MavenArtifactProvisionOption
amdatuOAuthConsumerRegistry() {
- return
mavenBundle().groupId("org.amdatu.authentication.oauth").artifactId("consumerregistry-fs")
- .versionAsInProject();
- }
-
protected static MavenArtifactProvisionOption fileBasedConfiguration() {
return
mavenBundle().groupId("org.amdatu.core.config").artifactId("filebased").versionAsInProject();
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
