Author: ivol37 at gmail.com
Date: Wed Nov 10 11:30:26 2010
New Revision: 328
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-web/wink-application/
- copied from r324, /trunk/amdatu-core/wink-application/
Removed:
trunk/amdatu-core/wink-application/
Modified:
trunk/amdatu-authorization/loginservice/pom.xml
trunk/amdatu-core/cassandra-application/pom.xml
trunk/amdatu-core/pom.xml
trunk/amdatu-core/useradmin-cassandra-store/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-opensocial/gadget-management/pom.xml
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-release.xml
trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml
trunk/amdatu-web/pom.xml
trunk/amdatu-web/wink-application/pom.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
Modified: trunk/amdatu-authorization/loginservice/pom.xml
==============================================================================
--- trunk/amdatu-authorization/loginservice/pom.xml (original)
+++ trunk/amdatu-authorization/loginservice/pom.xml Wed Nov 10 11:30:26 2010
@@ -20,36 +20,12 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>com.springsource.org.apache.commons.logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>tenant-service</artifactId>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
- <scope>provided</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20090211</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
<build>
Modified: trunk/amdatu-core/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-core/cassandra-application/pom.xml (original)
+++ trunk/amdatu-core/cassandra-application/pom.xml Wed Nov 10 11:30:26 2010
@@ -49,8 +49,8 @@
<version>0.5</version>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml (original)
+++ trunk/amdatu-core/pom.xml Wed Nov 10 11:30:26 2010
@@ -22,7 +22,6 @@
<module>loghandler</module>
<module>tenant-service</module>
<module>useradmin-cassandra-store</module>
- <module>wink-application</module>
</modules>
<build>
Modified: trunk/amdatu-core/useradmin-cassandra-store/pom.xml
==============================================================================
--- trunk/amdatu-core/useradmin-cassandra-store/pom.xml (original)
+++ trunk/amdatu-core/useradmin-cassandra-store/pom.xml Wed Nov 10 11:30:26 2010
@@ -50,8 +50,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
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 11:30:26 2010
@@ -15,8 +15,8 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -75,8 +75,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</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 11:30:26 2010
@@ -39,8 +39,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</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 11:30:26 2010
@@ -104,15 +104,15 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>filebased-configuration</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>filebased</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
@@ -167,8 +167,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<version>${platform.version}</version>
<scope>runtime</scope>
<type>bundle</type>
Modified: trunk/amdatu-release/src/main/assembly/bin-release.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-release.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-release.xml Wed Nov 10
11:30:26 2010
@@ -135,7 +135,7 @@
<filtered>true</filtered>
</fileSet>
<fileSet>
-
<directory>../amdatu-core/config-template-manager/src/main/resources/conf</directory>
+
<directory>../amdatu-core/config-templates/src/main/resources/conf</directory>
<outputDirectory>deploy</outputDirectory>
<filtered>true</filtered>
</fileSet>
Modified: trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml (original)
+++ trunk/amdatu-semanticweb/sparqlendpoint-gadget/pom.xml Wed Nov 10
11:30:26 2010
@@ -21,8 +21,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml (original)
+++ trunk/amdatu-web/pom.xml Wed Nov 10 11:30:26 2010
@@ -15,6 +15,7 @@
<modules>
<module>jsp-support</module>
<module>httpcontext</module>
+ <module>wink-application</module>
</modules>
<build>
Modified: trunk/amdatu-web/wink-application/pom.xml
==============================================================================
--- /trunk/amdatu-core/wink-application/pom.xml (original)
+++ trunk/amdatu-web/wink-application/pom.xml Wed Nov 10 11:30:26 2010
@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.core</artifactId>
+ <artifactId>org.amdatu.web</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Core - Apache Wink Application</name>
+ <name>Amdatu Web - Apache Wink Application</name>
<description>Embeds the Apache Wink libraries and provides the necessary
services to publish REST services from OSGi services</description>
<dependencies>
Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml (original)
+++ trunk/integration-tests/pom.xml Wed Nov 10 11:30:26 2010
@@ -48,8 +48,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>filebased-configuration</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>filebased</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -60,8 +60,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
@@ -110,8 +110,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<scope>test</scope>
<type>bundle</type>
</dependency>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Nov 10 11:30:26 2010
@@ -296,8 +296,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>config-template-manager</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>templates</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
@@ -324,8 +324,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>filebased-configuration</artifactId>
+ <groupId>org.amdatu.core.config</groupId>
+ <artifactId>filebased</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
@@ -345,8 +345,8 @@
<type>bundle</type>
</dependency>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>wink-application</artifactId>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>wink</artifactId>
<version>${platform.version}</version>
<scope>provided</scope>
<type>bundle</type>
@@ -829,7 +829,7 @@
<filtering>true</filtering>
</resource>
<resource>
-
<directory>amdatu-core/config-template-manager/src/main/resources/conf</directory>
+
<directory>amdatu-core/config-templates/src/main/resources/conf</directory>
<filtering>true</filtering>
</resource>
</resources>
