Author: ivol37 at gmail.com
Date: Tue Nov 9 16:29:32 2010
New Revision: 298
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Modified:
trunk/amdatu-example/course-gadget/pom.xml
trunk/amdatu-example/course-service/pom.xml
trunk/amdatu-example/friends-gadget/pom.xml
trunk/amdatu-example/pom.xml
trunk/amdatu-release/pom.xml
trunk/pom.xml
trunk/src/main/resources/conf/felix-config.properties
Modified: trunk/amdatu-example/course-gadget/pom.xml
==============================================================================
--- trunk/amdatu-example/course-gadget/pom.xml (original)
+++ trunk/amdatu-example/course-gadget/pom.xml Tue Nov 9 16:29:32 2010
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.examples</artifactId>
+ <artifactId>org.amdatu.example</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.examples</groupId>
+ <groupId>org.amdatu.example</groupId>
<artifactId>coursegadget</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Example - Course gadget</name>
Modified: trunk/amdatu-example/course-service/pom.xml
==============================================================================
--- trunk/amdatu-example/course-service/pom.xml (original)
+++ trunk/amdatu-example/course-service/pom.xml Tue Nov 9 16:29:32 2010
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.examples</artifactId>
+ <artifactId>org.amdatu.example</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.examples</groupId>
+ <groupId>org.amdatu.example</groupId>
<artifactId>courseservice</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Example - Course service</name>
@@ -112,8 +112,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-Activator>org.amdatu.example.course.service.osgi.Activator</Bundle-Activator>
-
<Bundle-SymbolicName>org.amdatu.example.course-service</Bundle-SymbolicName>
+
<Bundle-Activator>org.amdatu.example.courseservice.osgi.Activator</Bundle-Activator>
+
<Bundle-SymbolicName>org.amdatu.example.courseservice</Bundle-SymbolicName>
<Embed-Dependency>*;scope=compile</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
Modified: trunk/amdatu-example/friends-gadget/pom.xml
==============================================================================
--- trunk/amdatu-example/friends-gadget/pom.xml (original)
+++ trunk/amdatu-example/friends-gadget/pom.xml Tue Nov 9 16:29:32 2010
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.examples</artifactId>
+ <artifactId>org.amdatu.example</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <groupId>org.amdatu.examples</groupId>
+ <groupId>org.amdatu.example</groupId>
<artifactId>friendsgadget</artifactId>
<packaging>bundle</packaging>
<name>Amdatu Example - Friends gadget</name>
Modified: trunk/amdatu-example/pom.xml
==============================================================================
--- trunk/amdatu-example/pom.xml (original)
+++ trunk/amdatu-example/pom.xml Tue Nov 9 16:29:32 2010
@@ -7,7 +7,7 @@
<artifactId>amdatu</artifactId>
<version>0.0.6-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.examples</artifactId>
+ <artifactId>org.amdatu.example</artifactId>
<name>Amdatu Examples</name>
<description>This module holds several examples</description>
<packaging>pom</packaging>
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Tue Nov 9 16:29:32 2010
@@ -38,14 +38,14 @@
<!-- Example bundles -->
<dependency>
<groupId>org.amdatu.example</groupId>
- <artifactId>course-gadget</artifactId>
+ <artifactId>coursegadget</artifactId>
<version>${platform.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.example</groupId>
- <artifactId>course-service</artifactId>
+ <artifactId>courseservice</artifactId>
<version>${platform.version}</version>
<scope>compile</scope>
<type>bundle</type>
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue Nov 9 16:29:32 2010
@@ -581,7 +581,7 @@
-->
<modules>
<module>amdatu-buildsupport</module>
- <module>amdatu-examples</module>
+ <module>amdatu-example</module>
<module>amdatu-libraries</module>
<module>amdatu-opensocial</module>
<module>amdatu-release</module>
Modified: trunk/src/main/resources/conf/felix-config.properties
==============================================================================
--- trunk/src/main/resources/conf/felix-config.properties (original)
+++ trunk/src/main/resources/conf/felix-config.properties Tue Nov 9
16:29:32 2010
@@ -81,7 +81,7 @@
felix.auto.start.5=reference:file:application-bundles/org.amdatu.opensocial.shindig-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-application-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-listener-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.cassandra-persistencemanager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.loghandler-${platform.version}.jar
reference:file:application-bundles/org.amdatu.opensocial.profile-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.tenant-service-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.authorization-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.httpcontext-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.wink-application-${platform.version}.jar
reference:file:application-bundles/org.amdatu.semanticweb.sesame-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.config-template-manager-${platform.version}.jar
reference:file:platform-bundles/org.amdatu.platform.useradmin-cassandra-store-${platform.version}.jar
felix.auto.start.10=reference:file:application-bundles/org.amdatu.opensocial.dashboard-${platform.version}.jar
reference:file:application-bundles/org.amdatu.opensocial.gadgetmanagement-${platform.version}.jar
reference:file:application-bundles/org.amdatu.web.jsp-${platform.version}.jar
felix.auto.start.20=reference:file:application-bundles/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
reference:file:gadget-bundles/org.amdatu.gadget.login-${platform.version}.jar
-felix.auto.start.30=reference:file:example-bundles/org.amdatu.example.friendsgadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-gadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-service-${platform.version}.jar
+felix.auto.start.30=reference:file:example-bundles/org.amdatu.example.friendsgadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.coursegadget-${platform.version}.jar
reference:file:example-bundles/org.amdatu.example.course-service-${platform.version}.jar
# Sets the initial start level of the framework upon startup.
org.osgi.framework.startlevel.beginning=40
