Author: ivol37 at gmail.com
Date: Mon Nov 8 15:38:05 2010
New Revision: 256
Log:
[AMDATU-129] Moved httpcontext module to amdatu-web subproject
Added:
trunk/amdatu-web/httpcontext/
- copied from r253, /trunk/platform-bundles/httpcontext/
Removed:
trunk/platform-bundles/httpcontext/
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-web/httpcontext/pom.xml
trunk/amdatu-web/jsp-support-bundle/pom.xml
trunk/amdatu-web/pom.xml
trunk/application-bundles/pom.xml
trunk/example-bundles/pom.xml
trunk/gadget-bundles/login-gadget/pom.xml
trunk/gadget-bundles/pom.xml
trunk/integration-tests/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/platform-bundles/authorization-service/pom.xml
trunk/platform-bundles/config-template-manager/pom.xml
trunk/platform-bundles/pom.xml
trunk/platform-bundles/sesame-application/pom.xml
trunk/platform-bundles/shindig-application/pom.xml
trunk/platform-bundles/useradmin-cassandra-store/pom.xml
trunk/platform-bundles/wink-application/pom.xml
trunk/pom.xml
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Mon Nov 8 15:38:05 2010
@@ -118,7 +118,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
Modified: trunk/amdatu-web/httpcontext/pom.xml
==============================================================================
--- /trunk/platform-bundles/httpcontext/pom.xml (original)
+++ trunk/amdatu-web/httpcontext/pom.xml Mon Nov 8 15:38:05 2010
@@ -4,17 +4,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.platform-bundles</artifactId>
+ <artifactId>org.amdatu.web</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Platform - HTTP Context Service</name>
+ <name>Amdatu Web - HTTP Context Service</name>
<description>Provides a HTTPContext implementation</description>
<dependencies>
-
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
Modified: trunk/amdatu-web/jsp-support-bundle/pom.xml
==============================================================================
--- trunk/amdatu-web/jsp-support-bundle/pom.xml (original)
+++ trunk/amdatu-web/jsp-support-bundle/pom.xml Mon Nov 8 15:38:05 2010
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml (original)
+++ trunk/amdatu-web/pom.xml Mon Nov 8 15:38:05 2010
@@ -14,6 +14,7 @@
<modules>
<module>jsp-support-bundle</module>
+ <module>httpcontext</module>
</modules>
<build>
Modified: trunk/application-bundles/pom.xml
==============================================================================
--- trunk/application-bundles/pom.xml (original)
+++ trunk/application-bundles/pom.xml Mon Nov 8 15:38:05 2010
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/example-bundles/pom.xml
==============================================================================
--- trunk/example-bundles/pom.xml (original)
+++ trunk/example-bundles/pom.xml Mon Nov 8 15:38:05 2010
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/gadget-bundles/login-gadget/pom.xml
==============================================================================
--- trunk/gadget-bundles/login-gadget/pom.xml (original)
+++ trunk/gadget-bundles/login-gadget/pom.xml Mon Nov 8 15:38:05 2010
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/gadget-bundles/pom.xml
==============================================================================
--- trunk/gadget-bundles/pom.xml (original)
+++ trunk/gadget-bundles/pom.xml Mon Nov 8 15:38:05 2010
@@ -21,7 +21,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Mon Nov 8 15:38:05 2010
@@ -54,7 +54,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</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
Mon Nov 8 15:38:05 2010
@@ -297,7 +297,7 @@
}
protected static MavenArtifactProvisionOption amdatuHttpContext() {
- return
mavenBundle().groupId("org.amdatu.platform").artifactId("httpcontext").versionAsInProject();
+ return
mavenBundle().groupId("org.amdatu.web").artifactId("httpcontext").versionAsInProject();
}
protected static MavenArtifactProvisionOption fileBasedConfiguration() {
Modified: trunk/platform-bundles/authorization-service/pom.xml
==============================================================================
--- trunk/platform-bundles/authorization-service/pom.xml (original)
+++ trunk/platform-bundles/authorization-service/pom.xml Mon Nov 8
15:38:05 2010
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/platform-bundles/config-template-manager/pom.xml
==============================================================================
--- trunk/platform-bundles/config-template-manager/pom.xml (original)
+++ trunk/platform-bundles/config-template-manager/pom.xml Mon Nov 8
15:38:05 2010
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/platform-bundles/pom.xml
==============================================================================
--- trunk/platform-bundles/pom.xml (original)
+++ trunk/platform-bundles/pom.xml Mon Nov 8 15:38:05 2010
@@ -19,7 +19,6 @@
<module>cassandra-listener</module>
<module>cassandra-persistencemanager</module>
<module>config-template-manager</module>
- <module>httpcontext</module>
<module>loghandler</module>
<module>shindig-application</module>
<module>profile-service</module>
Modified: trunk/platform-bundles/sesame-application/pom.xml
==============================================================================
--- trunk/platform-bundles/sesame-application/pom.xml (original)
+++ trunk/platform-bundles/sesame-application/pom.xml Mon Nov 8 15:38:05 2010
@@ -27,7 +27,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/platform-bundles/shindig-application/pom.xml
==============================================================================
--- trunk/platform-bundles/shindig-application/pom.xml (original)
+++ trunk/platform-bundles/shindig-application/pom.xml Mon Nov 8 15:38:05 2010
@@ -111,7 +111,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/platform-bundles/useradmin-cassandra-store/pom.xml
==============================================================================
--- trunk/platform-bundles/useradmin-cassandra-store/pom.xml (original)
+++ trunk/platform-bundles/useradmin-cassandra-store/pom.xml Mon Nov 8
15:38:05 2010
@@ -56,7 +56,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/platform-bundles/wink-application/pom.xml
==============================================================================
--- trunk/platform-bundles/wink-application/pom.xml (original)
+++ trunk/platform-bundles/wink-application/pom.xml Mon Nov 8 15:38:05 2010
@@ -39,7 +39,7 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<scope>provided</scope>
<type>bundle</type>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Nov 8 15:38:05 2010
@@ -302,7 +302,7 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.platform</groupId>
+ <groupId>org.amdatu.web</groupId>
<artifactId>httpcontext</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
