Author: ivol37 at gmail.com
Date: Wed Nov 10 12:09:29 2010
New Revision: 338
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-authorization/login-gadget/pom.xml
trunk/amdatu-authorization/login-service/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-opensocial/dashboard-bundle/pom.xml
trunk/amdatu-opensocial/gadget-management/pom.xml
trunk/amdatu-opensocial/profile-service/pom.xml
trunk/amdatu-release/pom.xml
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/pom.xml
Modified: trunk/amdatu-authorization/login-gadget/pom.xml
==============================================================================
--- trunk/amdatu-authorization/login-gadget/pom.xml (original)
+++ trunk/amdatu-authorization/login-gadget/pom.xml Wed Nov 10 12:09:29 2010
@@ -7,8 +7,8 @@
<artifactId>org.amdatu.authorization</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>logingadget</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>gadget</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Authorization - Login gadget</name>
<description>Provides a login gadget</description>
@@ -21,8 +21,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-authorization/login-service/pom.xml
==============================================================================
--- trunk/amdatu-authorization/login-service/pom.xml (original)
+++ trunk/amdatu-authorization/login-service/pom.xml Wed Nov 10 12:09:29 2010
@@ -7,8 +7,8 @@
<artifactId>org.amdatu.authorization</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Authorization - Login service</name>
<description>Provides a service for login and logout
functionality</description>
@@ -36,9 +36,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.authorization.loginservice.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.authorization.loginservice</Bundle-SymbolicName>
-
<Export-Package>org.amdatu.authorization.loginservice</Export-Package>
+
<Bundle-Activator>org.amdatu.authorization.login.service.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.authorization.login.service</Bundle-SymbolicName>
+
<Export-Package>org.amdatu.authorization.login.service</Export-Package>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Wed Nov 10 12:09:29 2010
@@ -81,8 +81,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-opensocial/dashboard-bundle/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/dashboard-bundle/pom.xml (original)
+++ trunk/amdatu-opensocial/dashboard-bundle/pom.xml Wed Nov 10 12:09:29 2010
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-opensocial/gadget-management/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/gadget-management/pom.xml (original)
+++ trunk/amdatu-opensocial/gadget-management/pom.xml Wed Nov 10 12:09:29 2010
@@ -21,8 +21,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-opensocial/profile-service/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/profile-service/pom.xml (original)
+++ trunk/amdatu-opensocial/profile-service/pom.xml Wed Nov 10 12:09:29 2010
@@ -45,8 +45,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Wed Nov 10 12:09:29 2010
@@ -76,8 +76,8 @@
<!-- Platform bundles -->
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<version>${platform.version}</version>
<scope>compile</scope>
<type>bundle</type>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Wed Nov 10 12:09:29 2010
@@ -111,6 +111,13 @@
</dependency>
<dependency>
<groupId>org.amdatu.web.rest</groupId>
+ <artifactId>jaxrs</artifactId>
+ <version>${platform.version}</version>
+ <scope>test</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.web.rest</groupId>
<artifactId>wink</artifactId>
<scope>test</scope>
<type>bundle</type>
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Wed Nov 10 12:09:29 2010
@@ -124,6 +124,7 @@
amdatuCassandraPersistenceManager(),
amdatuTenantService(),
amdatuUserAdminCassandraStore(),
+ amdatuJaxRs(),
amdatuWink(),
amdatuLogHandler(),
amdatuJspSupport(),
@@ -267,8 +268,12 @@
////////////////////////////////////////////////////////////
// A load of Pax Exam definitions for easier (typo-free) provisioning
+ protected static MavenArtifactProvisionOption amdatuJaxRs() {
+ return
mavenBundle().groupId("org.amdatu.web.rest").artifactId("jaxrs").versionAsInProject();
+ }
+
protected static MavenArtifactProvisionOption amdatuWink() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("wink-application").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.web.rest").artifactId("wink").versionAsInProject();
}
protected static MavenArtifactProvisionOption
amdatuUserAdminCassandraStore() {
@@ -292,7 +297,7 @@
}
protected static MavenArtifactProvisionOption
amdatuConfigTemplateManager() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("config-template-manager").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core.config").artifactId("templates").versionAsInProject();
}
protected static MavenArtifactProvisionOption amdatuLogHandler() {
@@ -304,7 +309,7 @@
}
protected static MavenArtifactProvisionOption fileBasedConfiguration() {
- return
mavenBundle().groupId("org.amdatu.core").artifactId("filebased-configuration").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.core.config").artifactId("filebased").versionAsInProject();
}
protected static MavenArtifactProvisionOption felixScr() {
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Nov 10 12:09:29 2010
@@ -255,8 +255,8 @@
Platform bundles (start level 5)
-->
<dependency>
- <groupId>org.amdatu.authorization</groupId>
- <artifactId>loginservice</artifactId>
+ <groupId>org.amdatu.authorization.login</groupId>
+ <artifactId>service</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
