Author: [email protected]
Date: Tue May 8 14:33:22 2012
New Revision: 2318
Log:
[AMDATUAUTH-123] Small improvements, disabled itests
Modified:
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/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Tue May 8 14:33:22 2012
@@ -72,87 +72,94 @@
<!-- Internal project dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.service</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.api</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.client</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
+ <artifactId>org.amdatu.auth.config</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.login.service</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.server</artifactId>
+ <artifactId>org.amdatu.auth.oauth.api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <artifactId>org.amdatu.auth.oauth.client</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
+ <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
+ <artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
+ <artifactId>org.amdatu.auth.example.oauth.provider</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
+ <artifactId>org.amdatu.auth.oauth.server</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.config</artifactId>
+ <artifactId>org.amdatu.auth.tokenprovider</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
- <type>jar</type>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
@@ -170,6 +177,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.itest</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.tools.loghandler</artifactId>
<version>${project.version}</version>
<type>bundle</type>
@@ -191,16 +205,9 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.example.oauth.provider</artifactId>
+ <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -233,6 +240,7 @@
<scope>compile</scope>
<type>jar</type>
</dependency>
+
<!-- Dependency setup for amdatu-web project -->
<dependency>
<groupId>org.amdatu.web</groupId>
@@ -307,55 +315,6 @@
</modules>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
-
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- <configuration>
- <show>public</show>
- <detectOfflineLinks>false</detectOfflineLinks>
- <groups>
- <group>
- <title>Public API</title>
- <packages>
-
org.amdatu.auth.oauth.api:org.amdatu.auth.tools.fsstore:org.amdatu.auth.login.service:org.amdatu.auth.oauth.client:org.amdatu.auth.oauth.consumerregistry:org.amdatu.auth.oauth.server:org.amdatu.auth.test.integration.base:org.amdatu.auth.tokenprovider
- </packages>
- </group>
- <group>
- <title>Internal API</title>
- <packages>
-
org.amdatu.auth.example.*:org.amdatu.auth.login.service.*:org.amdatu.auth.oauth.client.*:org.amdatu.auth.oauth.consumerregistry.*:org.amdatu.auth.oauth.server.*:org.amdatu.auth.tokenprovider.*:org.amdatu.auth.tokenstore.*:org.amdatu.auth.tools.*:org.amdatu.auth.useradmin.rest.*:org.amdatu.auth.oauth.store.*
- </packages>
- </group>
- </groups>
- </configuration>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>site</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
<pluginManagement>
<plugins>
<!-- This plugin prevents the error "Plugin execution not covered by
lifecycle configuration"
@@ -440,5 +399,55 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <configuration>
+ <show>public</show>
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <groups>
+ <group>
+ <title>Public API</title>
+ <packages>
+
org.amdatu.auth.oauth.api:org.amdatu.auth.tools.fsstore:org.amdatu.auth.login.service:org.amdatu.auth.oauth.client:org.amdatu.auth.oauth.consumerregistry:org.amdatu.auth.oauth.server:org.amdatu.auth.test.integration.base:org.amdatu.auth.tokenprovider
+ </packages>
+ </group>
+ <group>
+ <title>Internal API</title>
+ <packages>
+
org.amdatu.auth.example.*:org.amdatu.auth.login.service.*:org.amdatu.auth.oauth.client.*:org.amdatu.auth.oauth.consumerregistry.*:org.amdatu.auth.oauth.server.*:org.amdatu.auth.tokenprovider.*:org.amdatu.auth.tokenstore.*:org.amdatu.auth.tools.*:org.amdatu.auth.useradmin.rest.*:org.amdatu.auth.oauth.store.*
+ </packages>
+ </group>
+ </groups>
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>site</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
\ No newline at end of file
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 8 14:33:22 2012
@@ -34,8 +34,6 @@
<amdatu.tenant.id>tenant1</amdatu.tenant.id>
<amdatu.tenant.name>Tenant 1</amdatu.tenant.name>
- <org.amdatu.core.version>0.2.1</org.amdatu.core.version>
- <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
<org.amdatu.cassandra.version>0.2.2</org.amdatu.cassandra.version>
<org.amdatu.opensocial.version>0.2.0</org.amdatu.opensocial.version>
Modified: trunk/amdatu-auth/release/pom.xml
==============================================================================
--- trunk/amdatu-auth/release/pom.xml (original)
+++ trunk/amdatu-auth/release/pom.xml Tue May 8 14:33:22 2012
@@ -37,61 +37,67 @@
<!-- Embedded dependencies -->
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.service</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.api</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.client</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
+ <artifactId>org.amdatu.auth.config</artifactId>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.login.service</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.example.oauth.provider</artifactId>
+ <artifactId>org.amdatu.auth.oauth.api</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
+ <artifactId>org.amdatu.auth.oauth.client</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
+ <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
+ <artifactId>org.amdatu.auth.example.oauth.consumer</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
+ <artifactId>org.amdatu.auth.example.oauth.provider</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
@@ -109,17 +115,48 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
+ <artifactId>org.amdatu.auth.tools.config</artifactId>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.fsstore</artifactId>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.itest</artifactId>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.loghandler</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.config</artifactId>
+ <artifactId>org.amdatu.auth.tools.rest</artifactId>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tools.rest.doclet</artifactId>
<scope>runtime</scope>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
</dependencies>
+
<profiles>
<profile>
<id>release</id>
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 8 14:33:22 2012
@@ -30,20 +30,23 @@
<org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
</properties>
+<!-- FIXME: for now disable integration tests
<modules>
<module>base</module>
<module>tests</module>
</modules>
+-->
<dependencyManagement>
<dependencies>
- <!--
+ <!-- FIXME: for now disable integration tests
+
Amdatu core and web itest base is crosscutting to both the base and
tests
module. This brings in the all dependencies required to work with
the core and web fixtures. Scope is intentionally set to compile in
this
section so that depending (on the base) itest modules will in turn
recieve these transitive dependencies.
- -->
+
<dependency>
<groupId>org.amdatu.itest</groupId>
<artifactId>org.amdatu.itest.base</artifactId>
@@ -59,13 +62,13 @@
<type>bundle</type>
</dependency>
- <!--
+
Some dependency scopes are intentionally set to compile in this
section so that depending (on the base) itest modules will in turn
recieve
these transitive dependencies.
- -->
- <!-- FIXME: temporary disabled
+
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
@@ -122,6 +125,7 @@
<!--
See explanation in the dependencyManagement section above.
-->
+ <!-- FIXME: for now disable integration tests
<dependency>
<groupId>org.amdatu.itest</groupId>
<artifactId>org.amdatu.itest.base</artifactId>
@@ -132,6 +136,7 @@
<artifactId>org.amdatu.itest.web.base</artifactId>
<type>bundle</type>
</dependency>
+ -->
</dependencies>
</project>
\ No newline at end of file
Modified:
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
==============================================================================
---
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
(original)
+++
trunk/amdatu-auth/useradmin-rest/src/main/java/org/amdatu/auth/useradmin/rest/osgi/Activator.java
Tue May 8 14:33:22 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
@@ -31,7 +31,7 @@
/**
* This is the activator for the UserAdmin REST API bundle.
- *
+ *
* @author <a href="mailto:[email protected]";>Amdatu Project
Team</a>
*/
public class Activator extends ServiceDependentActivator {
@@ -45,7 +45,7 @@
public void initWithDependencies(final BundleContext context, final
DependencyManager manager) throws Exception {
// Create the users resource service and register it as REST service
manager.add(createComponent()
- .setInterface(new String[] {ManagedService.class.getName(),
Object.class.getName()}, null)
+ .setInterface(ManagedService.class.getName(), null)
.setImplementation(UsersResource.class)
.add(createServiceDependency().setService(LogService.class).setRequired(true))
.add(createServiceDependency().setService(UserAdmin.class).setRequired(true))
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
