Author: [email protected]
Date: Tue May 1 11:02:10 2012
New Revision: 2292
Log:
[AMDATUAUTH-123] Updated poms for new parent
Modified:
trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml
trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml
trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml
trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml
trunk/amdatu-auth/config/pom.xml
trunk/amdatu-auth/login-service/pom.xml
trunk/amdatu-auth/oauth-api/pom.xml
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceConsumer.java
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceProvider.java
trunk/amdatu-auth/oauth-client/pom.xml
trunk/amdatu-auth/oauth-consumerregistry/pom.xml
trunk/amdatu-auth/oauth-example/consumer/pom.xml
trunk/amdatu-auth/oauth-example/provider/pom.xml
trunk/amdatu-auth/oauth-server/pom.xml
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/release-demo/pom.xml
trunk/amdatu-auth/release/pom.xml
trunk/amdatu-auth/test-integration/pom.xml
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTestBase.java
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
trunk/amdatu-auth/test-performance/test-bundle/pom.xml
trunk/amdatu-auth/tokenprovider/pom.xml
trunk/amdatu-auth/tools/itest/pom.xml
trunk/amdatu-auth/tools/rest-doclet/pom.xml
trunk/amdatu-auth/tools/rest/pom.xml
trunk/amdatu-auth/useradmin-rest/pom.xml
Modified: trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/fs-store-consumer/pom.xml Tue May 1
11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle implements a persistent storage for oAuth service
consumers</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
@@ -43,6 +44,8 @@
<artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -52,7 +55,7 @@
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.fsstore</artifactId>
- <scope>compile</scope>
+ <type>jar</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/mem-store-consumer/pom.xml Tue May 1
11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle implements an in-memory storage for OAuth service
consumers</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
Modified: trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/mem-store-nonce/pom.xml Tue May 1
11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle implements a persistent storage for oAuth
nonces</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.server</artifactId>
Modified: trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml
==============================================================================
--- trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml (original)
+++ trunk/amdatu-auth/auth-stores/mem-store-token/pom.xml Tue May 1
11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle implements an in-memory token store</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
Modified: trunk/amdatu-auth/config/pom.xml
==============================================================================
--- trunk/amdatu-auth/config/pom.xml (original)
+++ trunk/amdatu-auth/config/pom.xml Tue May 1 11:02:10 2012
@@ -27,42 +27,6 @@
<name>Amdatu Auth - Configuration files</name>
<description>This artifacts holds the configuration files for Amdatu
Auth.</description>
- <repositories>
- <repository>
- <id>amdatu.releases</id>
- <name>Amdatu Release Repository</name>
- <url>http://repository.amdatu.org/releases</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>amdatu.snapshots</id>
- <name>Amdatu Snapshot Repository</name>
- <url>http://repository.amdatu.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>riptano</id>
- <name>Riptano Repository</name>
- <url>http://mvn.riptano.com/content/repositories/riptano</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<build>
<resources>
<resource>
Modified: trunk/amdatu-auth/login-service/pom.xml
==============================================================================
--- trunk/amdatu-auth/login-service/pom.xml (original)
+++ trunk/amdatu-auth/login-service/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>Provides a service for login and logout
functionality</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
@@ -53,11 +54,12 @@
<artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.json</groupId>
Modified: trunk/amdatu-auth/oauth-api/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-api/pom.xml (original)
+++ trunk/amdatu-auth/oauth-api/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,15 @@
<description>This bundle includes the net.oauth API</description>
<dependencies>
+ <!-- Provided dependencies -->
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>4.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>net.oauth.core</groupId>
<artifactId>oauth</artifactId>
@@ -54,12 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>4.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.0.1</version>
<scope>compile</scope>
Modified:
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceConsumer.java
==============================================================================
---
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceConsumer.java
(original)
+++
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceConsumer.java
Tue May 1 11:02:10 2012
@@ -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
@@ -18,7 +18,7 @@
import java.util.Map;
/**
- * This interface represents an oAuth service consumer. An oAuth service
consumer is a service that invokes
+ * This interface represents an OAuth service consumer. An OAuth service
consumer is a service that invokes
* a service provider on behalf of another client. The service consumer
communicates with the service provider
* using an access token. This access token is a request token that is
authorized by the client first.
* The service consumer needs to identify itself with the service provider,
such that the service provider
@@ -26,7 +26,7 @@
* consumer key and secret.
* The callback URL is the URL to which the client is redirected to authorize
a request token received earlier
* in the process and to exchange it for an access token.
- *
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
public interface OAuthServiceConsumer {
@@ -55,7 +55,7 @@
* Returns a descriptive name of this consumer. The name is used on the
authorization page on which
* the user must allow this consumer to access its protected resource. The
name is by no means used
* as identifier.
- *
+ *
* @return a descriptive name of this service consumer.
*/
String getName();
@@ -63,7 +63,7 @@
/**
* Returns the consumer key. The consumer key is used by a consumer to
identify itself to the
* service provider. The consumer key is unique in the oAuth server that
supports this consumer.
- *
+ *
* @return A public key that identifies this consumer.
*/
String getConsumerKey();
@@ -74,7 +74,7 @@
* secret is only known by the service consumer and the service provider.
The consumer and provider
* exchange this secret when communicating with each other to ensure the
identity of the service
* consumer.
- *
+ *
* @return The consumer secret, a private key only known by the service
consumer and service provider.
*/
String getConsumerSecret();
@@ -84,7 +84,7 @@
* The callback allows the service consumer to exchange its previous
acquired request token for an
* access token by the service provider. Exchanging this token can only
succeed after the user having
* authorized the request token (in three-legged oAuth that is).
- *
+ *
* @return The URL to which a user will be redirected after a request
token has been authorized.
*/
String getCallbackUrl();
@@ -93,7 +93,7 @@
* Map of arbitrary additional properties stored in the service consumer.
This could for example be used
* to associated a service consumer with subscribed tenants.
* Available properties:
- *
+ *
* ACCEPT_ENCODING - Restricts the content-codings that are acceptable for
the consumer in the response
* of the service provider. See
http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html (14.3). Value
* must be a String.
@@ -103,7 +103,7 @@
* be a net.oauth.ParameterStyle.
* OWNERID - ID of the user account that owns the service consumer. The
owner id is set when a user
* registered the service consumer using the 'Register new Application'
application.
- *
+ *
* @return Map of extended properties
*/
Map<String, String> getProperties();
Modified:
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceProvider.java
==============================================================================
---
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceProvider.java
(original)
+++
trunk/amdatu-auth/oauth-api/src/main/java/org/amdatu/auth/oauth/api/OAuthServiceProvider.java
Tue May 1 11:02:10 2012
@@ -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
@@ -17,34 +17,34 @@
/**
* This interface represents an OAuth service provider. An OAuth service
provider provides the three endpoints of
- * an OAuth server; request token, authorize token and access token needed to
complete the oAuth dance.
+ * an OAuth server; request token, authorize token and access token needed to
complete the OAuth dance.
* It looks redundant comparing it to the net.oauth.OAuthServiceProvider. But
that its a class and not an interface.
* In Amdatu we would like to expose the OAuth server as a service and for
that we need this interface. Furthermore,
* getters for the three endpoints are missing in
net.oauth.OAuthServiceProvider.
- *
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
public interface OAuthServiceProvider {
/**
- * Returns the absolute URL of the oAuth server endpoint that generates
the request tokens.
- * For more information about oAuth request tokens, see
http://oauth.net/core/1.0/
- *
+ * Returns the absolute URL of the OAuth server endpoint that generates
the request tokens.
+ * For more information about OAuth request tokens, see
http://oauth.net/core/1.0/
+ *
* @return The absolute URL of the request token endpoint.
*/
String getRequestTokenURL();
/**
- * Returns the absolute URL of the oAuth server endpoint that authorizes
request tokens.
- * For more information about authorizing oAuth request tokens, see
http://oauth.net/core/1.0/
- *
+ * Returns the absolute URL of the OAuth server endpoint that authorizes
request tokens.
+ * For more information about authorizing OAuth request tokens, see
http://oauth.net/core/1.0/
+ *
* @return The absolute URL of the authorize token endpoint.
*/
String getAuthorizeTokenURL();
/**
- * Returns the absolute URL of the oAuth server endpoint that exchanges
request tokens for access tokens.
- * For more information about oAuth access tokens, see
http://oauth.net/core/1.0/
- *
+ * Returns the absolute URL of the OAuth server endpoint that exchanges
request tokens for access tokens.
+ * For more information about OAuth access tokens, see
http://oauth.net/core/1.0/
+ *
* @return The absolute URL of the access token endpoint.
*/
String getAccessTokenURL();
Modified: trunk/amdatu-auth/oauth-client/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-client/pom.xml (original)
+++ trunk/amdatu-auth/oauth-client/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle includes an API for OAuth service
consumers</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.api</artifactId>
@@ -38,6 +39,8 @@
<artifactId>org.amdatu.web.httpcontext</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Modified: trunk/amdatu-auth/oauth-consumerregistry/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-consumerregistry/pom.xml (original)
+++ trunk/amdatu-auth/oauth-consumerregistry/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle implements a persistent storage for oAuth service
consumers</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
@@ -73,6 +74,8 @@
<artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.rest</artifactId>
@@ -81,8 +84,7 @@
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
Modified: trunk/amdatu-auth/oauth-example/consumer/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/consumer/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/consumer/pom.xml Tue May 1 11:02:10 2012
@@ -32,6 +32,7 @@
</properties>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
@@ -89,11 +90,12 @@
<artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
+ <type>jar</type>
</dependency>
<dependency>
<groupId>org.json</groupId>
Modified: trunk/amdatu-auth/oauth-example/provider/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-example/provider/pom.xml (original)
+++ trunk/amdatu-auth/oauth-example/provider/pom.xml Tue May 1 11:02:10 2012
@@ -32,6 +32,7 @@
</properties>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
@@ -85,16 +86,17 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.osgisupport</groupId>
- <artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
- </dependency>
- <dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
+ <dependency>
+ <groupId>org.amdatu.osgisupport</groupId>
+ <artifactId>org.amdatu.osgisupport</artifactId>
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
Modified: trunk/amdatu-auth/oauth-server/pom.xml
==============================================================================
--- trunk/amdatu-auth/oauth-server/pom.xml (original)
+++ trunk/amdatu-auth/oauth-server/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle includes an API for oAuth service
providers</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.api</artifactId>
@@ -43,13 +44,11 @@
<artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
<type>bundle</type>
</dependency>
-
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
<type>bundle</type>
</dependency>
-
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.dispatcher</artifactId>
@@ -71,6 +70,7 @@
<type>bundle</type>
</dependency>
+ <!-- Embedded dependencies -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -95,7 +95,6 @@
<version>1.1.1</version>
<scope>compile</scope>
</dependency>
-
</dependencies>
<build>
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Tue May 1 11:02:10 2012
@@ -226,7 +226,13 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
-
+ <dependency>
+ <groupId>org.amdatu.osgisupport</groupId>
+ <artifactId>org.amdatu.osgisupport</artifactId>
+ <version>${org.amdatu.platform.version}</version>
+ <scope>compile</scope>
+ <type>jar</type>
+ </dependency>
<!-- Dependency setup for amdatu-web project -->
<dependency>
<groupId>org.amdatu.web</groupId>
@@ -308,11 +314,6 @@
<version>2.3.1</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
@@ -320,13 +321,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</plugin>
-
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.8.1</version>
<configuration>
<show>public</show>
<detectOfflineLinks>false</detectOfflineLinks>
@@ -373,20 +373,6 @@
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.1</version>
- <executions>
- <execution>
- <id>bundle-sources</id>
- <phase>deploy</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Plugin configuration for -Pdeploy -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: trunk/amdatu-auth/release-demo/pom.xml
==============================================================================
--- trunk/amdatu-auth/release-demo/pom.xml (original)
+++ trunk/amdatu-auth/release-demo/pom.xml Tue May 1 11:02:10 2012
@@ -255,8 +255,6 @@
<scope>runtime</scope>
<type>bundle</type>
</dependency>
-
-
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.jsp</artifactId>
@@ -264,7 +262,6 @@
<scope>runtime</scope>
<type>bundle</type>
</dependency>
-
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.resource</artifactId>
@@ -273,10 +270,6 @@
<type>bundle</type>
</dependency>
-
-
-
-
<!-- Auth dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
Modified: trunk/amdatu-auth/release/pom.xml
==============================================================================
--- trunk/amdatu-auth/release/pom.xml (original)
+++ trunk/amdatu-auth/release/pom.xml Tue May 1 11:02:10 2012
@@ -34,6 +34,7 @@
</properties>
<dependencies>
+ <!-- Embedded dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.login.service</artifactId>
Modified: trunk/amdatu-auth/test-integration/pom.xml
==============================================================================
--- trunk/amdatu-auth/test-integration/pom.xml (original)
+++ trunk/amdatu-auth/test-integration/pom.xml Tue May 1 11:02:10 2012
@@ -31,10 +31,8 @@
</properties>
<modules>
- <!-- FIXME: temporary disabled
<module>base</module>
<module>tests</module>
--->
</modules>
<dependencyManagement>
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTestBase.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTestBase.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/AuthTestBase.java
Tue May 1 11:02:10 2012
@@ -25,7 +25,6 @@
*
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
-@SuppressWarnings("deprecation")
public abstract class AuthTestBase extends IntegrationTestBase {
private volatile OAuthServiceProvider m_oAuthServiceProvider;
private volatile OAuthServiceConsumerRegistry m_consumerRegistry;
Modified:
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
==============================================================================
---
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
(original)
+++
trunk/amdatu-auth/test-integration/tests/src/test/java/org/amdatu/auth/test/integration/tests/OAuthTwoLeggedTest.java
Tue May 1 11:02:10 2012
@@ -35,7 +35,6 @@
import org.osgi.service.log.LogService;
-@SuppressWarnings("deprecation")
public class OAuthTwoLeggedTest extends AuthTestBase {
public void execute() throws Exception {
Modified: trunk/amdatu-auth/test-performance/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-auth/test-performance/test-bundle/pom.xml (original)
+++ trunk/amdatu-auth/test-performance/test-bundle/pom.xml Tue May 1
11:02:10 2012
@@ -34,18 +34,19 @@
</properties>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.httpcontext</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.jaxrs</artifactId>
- <scope>provided</scope>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -61,8 +62,7 @@
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
+ <type>jar</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-auth/tokenprovider/pom.xml
==============================================================================
--- trunk/amdatu-auth/tokenprovider/pom.xml (original)
+++ trunk/amdatu-auth/tokenprovider/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>This bundle includes a token provider for token
distribution</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.tenant</groupId>
<artifactId>org.amdatu.tenant.api</artifactId>
@@ -38,6 +39,8 @@
<artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -47,8 +50,7 @@
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
+ <type>jar</type>
</dependency>
</dependencies>
Modified: trunk/amdatu-auth/tools/itest/pom.xml
==============================================================================
--- trunk/amdatu-auth/tools/itest/pom.xml (original)
+++ trunk/amdatu-auth/tools/itest/pom.xml Tue May 1 11:02:10 2012
@@ -28,12 +28,7 @@
<description>Tools for integration tests</description>
<dependencies>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>compile</scope>
- </dependency>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.itest</groupId>
<artifactId>org.amdatu.itest.base</artifactId>
@@ -46,6 +41,14 @@
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
+
+ <!-- Embedded dependencies -->
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
Modified: trunk/amdatu-auth/tools/rest-doclet/pom.xml
==============================================================================
--- trunk/amdatu-auth/tools/rest-doclet/pom.xml (original)
+++ trunk/amdatu-auth/tools/rest-doclet/pom.xml Tue May 1 11:02:10 2012
@@ -28,12 +28,14 @@
<description>A doclet to generate REST documentation</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.rest</artifactId>
- <scope>provided</scope>
<type>jar</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
Modified: trunk/amdatu-auth/tools/rest/pom.xml
==============================================================================
--- trunk/amdatu-auth/tools/rest/pom.xml (original)
+++ trunk/amdatu-auth/tools/rest/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>Tools for creating REST services</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
Modified: trunk/amdatu-auth/useradmin-rest/pom.xml
==============================================================================
--- trunk/amdatu-auth/useradmin-rest/pom.xml (original)
+++ trunk/amdatu-auth/useradmin-rest/pom.xml Tue May 1 11:02:10 2012
@@ -28,6 +28,7 @@
<description>Provides a REST API on UserAdmin</description>
<dependencies>
+ <!-- Provided dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tokenprovider</artifactId>
@@ -58,6 +59,8 @@
<artifactId>org.amdatu.web.jaxrs</artifactId>
<type>bundle</type>
</dependency>
+
+ <!-- Embedded dependencies -->
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
@@ -91,8 +94,7 @@
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
- <!-- FIXME: must become org.amdatu.platform.version -->
- <version>0.4.0-RC2</version>
+ <type>jar</type>
</dependency>
</dependencies>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
