Author: ivol37 at gmail.com
Date: Wed Nov 10 10:29:04 2010
New Revision: 323

Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout

Added:
   
trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
      - copied unchanged from r318, 
/trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.platform.cassandra.application.cfg
   
trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.core.configtemplatemanager.cfg
      - copied unchanged from r318, 
/trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.platform.configtemplatemanager.cfg
   
trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.core.loghandler.cfg
      - copied unchanged from r318, 
/trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.platform.loghandler.cfg
Removed:
   
trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.platform.cassandra.application.cfg
   
trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.platform.configtemplatemanager.cfg
   
trunk/amdatu-core/filebased-configuration/src/main/resources/conf/org.amdatu.platform.loghandler.cfg
Modified:
   trunk/amdatu-authorization/pom.xml
   
trunk/amdatu-core/cassandra-application/src/main/resources/conf/cassandra.yaml
   trunk/amdatu-core/filebased-configuration/pom.xml
   trunk/amdatu-core/pom.xml
   trunk/amdatu-example/pom.xml
   trunk/amdatu-opensocial/pom.xml
   trunk/amdatu-release/src/main/assembly/bin-release.xml
   trunk/amdatu-semanticweb/pom.xml
   trunk/amdatu-web/pom.xml
   trunk/integration-tests/pom.xml
   
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
   trunk/pom.xml
   trunk/src/main/resources/conf/felix-config.properties

Modified: trunk/amdatu-authorization/pom.xml
==============================================================================
--- trunk/amdatu-authorization/pom.xml  (original)
+++ trunk/amdatu-authorization/pom.xml  Wed Nov 10 10:29:04 2010
@@ -32,7 +32,7 @@
               </goals>
               <configuration>
                 <tasks>
-                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/application-bundles"
+                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-application"
                     overwrite="true" />
                 </tasks>
               </configuration>

Modified: 
trunk/amdatu-core/cassandra-application/src/main/resources/conf/cassandra.yaml
==============================================================================
--- 
trunk/amdatu-core/cassandra-application/src/main/resources/conf/cassandra.yaml  
    (original)
+++ 
trunk/amdatu-core/cassandra-application/src/main/resources/conf/cassandra.yaml  
    Wed Nov 10 10:29:04 2010
@@ -50,13 +50,13 @@
 
 # directories where Cassandra should store data on disk.
 data_file_directories:
-    - ${org.amdatu.platform.cassandra.application/datafiledir}
+    - ${org.amdatu.core.cassandra.application/datafiledir}
     
 # commit log
-commitlog_directory: ${org.amdatu.platform.cassandra.application/commitlogdir}
+commitlog_directory: ${org.amdatu.core.cassandra.application/commitlogdir}
 
 # saved caches
-saved_caches_directory: 
${org.amdatu.platform.cassandra.application/savedcachesdir}
+saved_caches_directory: ${org.amdatu.core.cassandra.application/savedcachesdir}
 
 # Size to allow commitlog to grow to before creating a new segment 
 commitlog_rotation_threshold_in_mb: 128

Modified: trunk/amdatu-core/filebased-configuration/pom.xml
==============================================================================
--- trunk/amdatu-core/filebased-configuration/pom.xml   (original)
+++ trunk/amdatu-core/filebased-configuration/pom.xml   Wed Nov 10 10:29:04 2010
@@ -56,7 +56,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/platform-bundles" overwrite="true" />
+                                <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-core" overwrite="true" />
                             </tasks>
                         </configuration>
                     </execution>

Modified: trunk/amdatu-core/pom.xml
==============================================================================
--- trunk/amdatu-core/pom.xml   (original)
+++ trunk/amdatu-core/pom.xml   Wed Nov 10 10:29:04 2010
@@ -40,7 +40,7 @@
               </goals>
               <configuration>
                 <tasks>
-                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/platform-bundles" overwrite="true" />
+                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-core" overwrite="true" />
                 </tasks>
               </configuration>
             </execution>

Modified: trunk/amdatu-example/pom.xml
==============================================================================
--- trunk/amdatu-example/pom.xml        (original)
+++ trunk/amdatu-example/pom.xml        Wed Nov 10 10:29:04 2010
@@ -42,7 +42,7 @@
               </goals>
               <configuration>
                 <tasks>
-                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/example-bundles"
+                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-examples"
                     overwrite="true" />
                 </tasks>
               </configuration>

Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml     (original)
+++ trunk/amdatu-opensocial/pom.xml     Wed Nov 10 10:29:04 2010
@@ -34,7 +34,7 @@
               </goals>
               <configuration>
                 <tasks>
-                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/application-bundles"
+                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-application"
                     overwrite="true" />
                 </tasks>
               </configuration>

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 
10:29:04 2010
@@ -13,7 +13,7 @@
   
   <dependencySets>
     <dependencySet>
-      <outputDirectory>application-bundles</outputDirectory>
+      <outputDirectory>amdatu-application</outputDirectory>
       
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
       <includes>
         <include>org.amdatu.application:*</include>
@@ -23,7 +23,7 @@
     </dependencySet>
     
     <dependencySet>
-      <outputDirectory>example-bundles</outputDirectory>
+      <outputDirectory>amdatu-examples</outputDirectory>
       
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
       <includes>
         <include>org.amdatu.example:*</include>
@@ -45,7 +45,7 @@
     
     <dependencySet>
       <scope>runtime</scope>
-      <outputDirectory>platform-bundles</outputDirectory>
+      <outputDirectory>amdatu-core</outputDirectory>
       
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
       <includes>
         <include>org.amdatu.core:*</include>
@@ -56,7 +56,7 @@
 
     <dependencySet>
       <scope>runtime</scope>
-      <outputDirectory>system-bundles</outputDirectory>
+      <outputDirectory>amdatu-system</outputDirectory>
       <includes>
         <include>org.apache.felix:*</include>
         <include>org.apache.sling:*</include>
@@ -105,42 +105,42 @@
     
     <!-- These entries need to be replaced when the new central configuration 
bundle is available -->
     <fileSet>
-      
<directory>../platform-bundles/cassandra-application/src/main/resources/conf</directory>
+      
<directory>../amdatu-core/cassandra-application/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>
     <fileSet>
-      
<directory>../example-bundles/course-gadget/src/main/resources/conf</directory>
+      
<directory>../amdatu-example/course-gadget/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>    
     <fileSet>
-      
<directory>../example-bundles/course-service/src/main/resources/conf</directory>
+      
<directory>../amdatu-example/course-service/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>  
     <fileSet>
-      
<directory>../example-bundles/friends-gadget/src/main/resources/conf</directory>
+      
<directory>../amdatu-example/friends-gadget/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>    
     <fileSet>
-      
<directory>../gadget-bundles/login-gadget/src/main/resources/conf</directory>
+      
<directory>../amdatu-authorization/login-gadget/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>    
     <fileSet>
-      
<directory>../gadget-bundles/sparqlendpoint-gadget/src/main/resources/conf</directory>
+      
<directory>../amdatu-semanticweb/sparqlendpoint-gadget/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>  
     <fileSet>
-      
<directory>../platform-bundles/config-template-manager/src/main/resources/conf</directory>
+      
<directory>../amdatu-core/config-template-manager/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>  
     <fileSet>
-      
<directory>../platform-bundles/loghandler/src/main/resources/conf</directory>
+      <directory>../amdatu-core/loghandler/src/main/resources/conf</directory>
       <outputDirectory>deploy</outputDirectory>
       <filtered>true</filtered>
     </fileSet>      

Modified: trunk/amdatu-semanticweb/pom.xml
==============================================================================
--- trunk/amdatu-semanticweb/pom.xml    (original)
+++ trunk/amdatu-semanticweb/pom.xml    Wed Nov 10 10:29:04 2010
@@ -32,7 +32,7 @@
               </goals>
               <configuration>
                 <tasks>
-                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/application-bundles"
+                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-application"
                     overwrite="true" />
                 </tasks>
               </configuration>

Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml    (original)
+++ trunk/amdatu-web/pom.xml    Wed Nov 10 10:29:04 2010
@@ -32,7 +32,7 @@
               </goals>
               <configuration>
                 <tasks>
-                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/application-bundles"
+                  <copy 
file="${project.build.directory}/${project.build.finalName}.jar" 
todir="${root.directory}/amdatu-application"
                     overwrite="true" />
                 </tasks>
               </configuration>

Modified: trunk/integration-tests/pom.xml
==============================================================================
--- trunk/integration-tests/pom.xml     (original)
+++ trunk/integration-tests/pom.xml     Wed Nov 10 10:29:04 2010
@@ -7,8 +7,8 @@
     <artifactId>amdatu</artifactId>
     <version>0.0.6-SNAPSHOT</version>
   </parent>
-  <groupId>org.amdatu.core</groupId>
-  <artifactId>integration-tests</artifactId>
+  <groupId>org.amdatu.test</groupId>
+  <artifactId>integration</artifactId>
   <packaging>bundle</packaging>
   <name>Amdatu Integration Tests</name>
   <description>This bundle contains integration tests for the 
project</description>

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 10:29:04 2010
@@ -60,11 +60,11 @@
 public abstract class IntegrationTestBase {
     public final static String TEST_PREFIX = ">  TESTING:  ";
     public final static int SERVICE_TIMEOUT = 30;
-    
-    // Hostname and portnumber to use during integration tests. These 
variables are interpolated 
+
+    // Hostname and portnumber to use during integration tests. These 
variables are interpolated
     // by the maven-resources-plugin during the process-test-sources lifecycle 
phase (see pom.xml).
     public final static String HOST_NAME = "${server.hostname}";
-    public final static int PORT_NR = Integer.parseInt("${server.port}"); 
+    public final static int PORT_NR = Integer.parseInt("${server.port}");
 
     @Inject
     protected BundleContext m_bundleContext;
@@ -83,13 +83,13 @@
 
             // Setting this system property unfortunately is necessary with 
the current Cassandra implementation
             
systemProperty("org.osgi.framework.system.packages.extra").value("sun.misc,com.sun.management"),
-            
+
             // Set System property to enable Jetty for the Felix http bundle
             systemProperty("org.apache.felix.http.jettyEnabled").value("true"),
             
systemProperty("org.apache.felix.http.whiteboardEnabled").value("true"),
             systemProperty("org.osgi.service.http.hostname").value(HOST_NAME),
             systemProperty("org.osgi.service.http.port").value(new 
Integer(PORT_NR).toString()),
-            
+
             new VMOption("-Xmx1g"),
             // Enable this line to allow a remote debugger to attach to the VM 
in which Pax Exam runs
             //new 
VMOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
@@ -255,8 +255,8 @@
     protected File integrationTestJarFile() {
         FileFilter ff = new FileFilter() {
             public boolean accept(File pathname) {
-                return 
pathname.getName().startsWith("org.amdatu.core.integration-tests-")
-                    && pathname.getName().endsWith(".jar") 
+                return 
pathname.getName().startsWith("org.amdatu.test.integration-")
+                    && pathname.getName().endsWith(".jar")
                     && !pathname.getName().endsWith("-javadoc.jar")
                     && !pathname.getName().endsWith("-sources.jar");
             }
@@ -298,7 +298,7 @@
     protected static MavenArtifactProvisionOption amdatuLogHandler() {
         return 
mavenBundle().groupId("org.amdatu.core").artifactId("loghandler").versionAsInProject();
     }
-    
+
     protected static MavenArtifactProvisionOption amdatuHttpContext() {
         return 
mavenBundle().groupId("org.amdatu.web").artifactId("httpcontext").versionAsInProject();
     }
@@ -322,11 +322,11 @@
     protected static MavenArtifactProvisionOption paxUserAdmin() {
         return 
mavenBundle().groupId("org.ops4j.pax.useradmin").artifactId("pax-useradmin-service").versionAsInProject();
     }
-    
+
     protected static MavenArtifactProvisionOption paxSwissbox() {
         return 
mavenBundle().groupId("org.ops4j.pax.swissbox").artifactId("pax-swissbox-core").versionAsInProject();
     }
-    
+
     protected static MavenArtifactProvisionOption ops4jBaseLang() {
         return 
mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").versionAsInProject();
     }
@@ -358,11 +358,11 @@
     protected static WrappedUrlProvisionOption commonsHttpClient() {
         return 
wrappedBundle(mavenBundle().groupId("commons-httpclient").artifactId("commons-httpclient"));
     }
-    
+
     protected static WrappedUrlProvisionOption commonsLogging() {
         return 
wrappedBundle(mavenBundle().groupId("commons-logging").artifactId("commons-logging"));
     }
-    
+
     protected static WrappedUrlProvisionOption commonsCodec() {
         return 
wrappedBundle(mavenBundle().groupId("commons-codec").artifactId("commons-codec"));
     }

Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml       (original)
+++ trunk/pom.xml       Wed Nov 10 10:29:04 2010
@@ -700,7 +700,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              
<outputDirectory>${root.directory}/system-bundles</outputDirectory>
+              
<outputDirectory>${root.directory}/amdatu-system</outputDirectory>
               <excludeTransitive>true</excludeTransitive>
               <includeScope>runtime</includeScope>
               
<includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.useradmin,org.ops4j.pax.swissbox,org.ops4j.base,org.apache.sling</includeGroupIds>
@@ -713,7 +713,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              
<outputDirectory>${root.directory}/system-bundles</outputDirectory>
+              
<outputDirectory>${root.directory}/amdatu-system</outputDirectory>
               <excludeTransitive>true</excludeTransitive>
               <includeScope>provided</includeScope>
               
<includeGroupIds>org.apache.felix,org.ops4j.pax.web,org.ops4j.pax.swissbox,org.ops4j.base,org.apache.sling</includeGroupIds>
@@ -722,13 +722,13 @@
 
           <!-- Copy all platform bundles -->
           <execution>
-            <id>copy-platform-bundles</id>
+            <id>copy-amdatu-core</id>
             <phase>package</phase>
             <goals>
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              
<outputDirectory>${root.directory}/platform-bundles</outputDirectory>
+              <outputDirectory>${root.directory}/amdatu-core</outputDirectory>
               <excludeTransitive>true</excludeTransitive>
               <includeScope>provided</includeScope>
               <includeGroupIds>org.amdatu.core</includeGroupIds>
@@ -801,7 +801,7 @@
               <outputDirectory>${deploy.directory}</outputDirectory>
               <resources>
                 <resource>
-                  
<directory>platform-bundles/cassandra-application/src/main/resources/conf</directory>
+                  
<directory>amdatu-core/cassandra-application/src/main/resources/conf</directory>
                   <filtering>true</filtering>
                 </resource>
                 <resource>
@@ -825,11 +825,11 @@
                   <filtering>true</filtering>
                 </resource>
                 <resource>
-                  
<directory>platform-bundles/loghandler/src/main/resources/conf</directory>
+                  
<directory>amdatu-core/loghandler/src/main/resources/conf</directory>
                   <filtering>true</filtering>
                 </resource>
                 <resource>
-                  
<directory>platform-bundles/config-template-manager/src/main/resources/conf</directory>
+                  
<directory>amdatu-core/config-template-manager/src/main/resources/conf</directory>
                   <filtering>true</filtering>
                 </resource>
               </resources>

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       Wed Nov 10 
10:29:04 2010
@@ -64,30 +64,28 @@
 
 # The following property specifies the directory to use as the bundle
 # auto-deploy directory; the default is 'bundle' in the working directory.
-#felix.auto.deploy.dir=system-bundles
+#felix.auto.deploy.dir=amdatu-system
 
 # The following property is a space-delimited list of bundle URLs
 # to install when the framework starts. The ending numerical component
 # is the target start level. Any number of these properties may be
 # specified for different start levels.
-#felix.auto.install.5=file:platform-bundles/org.amdatu.shindig-app-bundle-${platform.version}.jar
+#felix.auto.install.5=
 
 # The following property is a space-delimited list of bundle URLs
 # to install and start when the framework starts. The ending numerical
 # component is the target start level. Any number of these properties
 # may be specified for different start levels.
-felix.auto.start.1=reference:file:system-bundles/org.apache.felix.configadmin-1.2.4.jar
 
reference:file:system-bundles/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
 reference:file:system-bundles/org.apache.felix.eventadmin-1.2.2.jar 
reference:file:system-bundles/org.apache.felix.fileinstall-3.0.0.jar 
reference:file:system-bundles/org.apache.felix.log-1.0.0.jar 
reference:file:system-bundles/org.apache.felix.main-2.0.5.jar 
reference:file:system-bundles/org.apache.felix.metatype-1.0.4.jar 
reference:file:system-bundles/org.apache.felix.shell.tui-1.4.1.jar 
reference:file:system-bundles/org.apache.felix.shell-1.4.2.jar 
reference:file:system-bundles/org.apache.felix.webconsole-3.1.2.jar 
reference:file:system-bundles/org.apache.sling.commons.mime-2.1.4.jar 
reference:file:system-bundles/org.apache.sling.commons.osgi-2.0.6.jar 
reference:file:system-bundles/org.osgi.compendium-1.0.0.jar 
reference:file:system-bundles/org.osgi.core-1.0.0.jar 
reference:file:system-bundles/pax-useradmin-service-0.0.1-SNAPSHOT.jar 
reference:file:system-bundles/org.apache.felix.http.bundle-${org.apache.felix.http.version}.jar
 reference:file:system-bundles/pax-swissbox-core-${pax.swissbox.version}.jar 
reference:file:system-bundles/ops4j-base-lang-1.2.2.jar 
reference:file:system-bundles/org.apache.felix.scr-1.6.0.jar
-felix.auto.start.2=reference:file:platform-bundles/org.amdatu.core.filebased-configuration-${platform.version}.jar
-felix.auto.start.5=reference:file:application-bundles/org.amdatu.opensocial.shindig-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.cassandra-application-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.cassandra-listener-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.cassandra-persistencemanager-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.loghandler-${platform.version}.jar
 
reference:file:application-bundles/org.amdatu.opensocial.profile-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.tenant-service-${platform.version}.jar
 
reference:file:application-bundles/org.amdatu.authorization.loginservice-${platform.version}.jar
 
reference:file:application-bundles/org.amdatu.web.httpcontext-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.wink-application-${platform.version}.jar
 
reference:file:application-bundles/org.amdatu.semanticweb.sesame-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.config-template-manager-${platform.version}.jar
 
reference:file:platform-bundles/org.amdatu.core.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:application-bundles/org.amdatu.authorization.logingadget-${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.courseservice-${platform.version}.jar
+felix.auto.start.1=reference:file:amdatu-system/org.apache.felix.configadmin-1.2.4.jar
 
reference:file:amdatu-system/org.apache.felix.dependencymanager-3.0.0-SNAPSHOT.jar
 reference:file:amdatu-system/org.apache.felix.eventadmin-1.2.2.jar 
reference:file:amdatu-system/org.apache.felix.fileinstall-3.0.0.jar 
reference:file:amdatu-system/org.apache.felix.log-1.0.0.jar 
reference:file:amdatu-system/org.apache.felix.main-2.0.5.jar 
reference:file:amdatu-system/org.apache.felix.metatype-1.0.4.jar 
reference:file:amdatu-system/org.apache.felix.shell.tui-1.4.1.jar 
reference:file:amdatu-system/org.apache.felix.shell-1.4.2.jar 
reference:file:amdatu-system/org.apache.felix.webconsole-3.1.2.jar 
reference:file:amdatu-system/org.apache.sling.commons.mime-2.1.4.jar 
reference:file:amdatu-system/org.apache.sling.commons.osgi-2.0.6.jar 
reference:file:amdatu-system/org.osgi.compendium-1.0.0.jar 
reference:file:amdatu-system/org.osgi.core-1.0.0.jar 
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar 
reference:file:amdatu-system/org.apache.felix.http.bundle-${org.apache.felix.http.version}.jar
 reference:file:amdatu-system/pax-swissbox-core-${pax.swissbox.version}.jar 
reference:file:amdatu-system/ops4j-base-lang-1.2.2.jar 
reference:file:amdatu-system/org.apache.felix.scr-1.6.0.jar
+felix.auto.start.2=reference:file:amdatu-core/org.amdatu.core.filebased-configuration-${platform.version}.jar
 
reference:file:amdatu-core/org.amdatu.core.cassandra-application-${platform.version}.jar
 
reference:file:amdatu-core/org.amdatu.core.cassandra-listener-${platform.version}.jar
 
reference:file:amdatu-core/org.amdatu.core.cassandra-persistencemanager-${platform.version}.jar
 reference:file:amdatu-core/org.amdatu.core.loghandler-${platform.version}.jar 
reference:file:amdatu-core/org.amdatu.core.tenant-service-${platform.version}.jar
 
reference:file:amdatu-core/org.amdatu.core.config-template-manager-${platform.version}.jar
 
reference:file:amdatu-core/org.amdatu.core.useradmin-cassandra-store-${platform.version}.jar
 
reference:file:amdatu-core/org.amdatu.core.wink-application-${platform.version}.jar
 
+felix.auto.start.10=reference:file:amdatu-application/org.amdatu.opensocial.shindig-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.opensocial.profile-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.authorization.loginservice-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.web.httpcontext-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.semanticweb.sesame-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.opensocial.dashboard-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.opensocial.gadgetmanagement-${platform.version}.jar
 reference:file:amdatu-application/org.amdatu.web.jsp-${platform.version}.jar 
reference:file:amdatu-application/org.amdatu.semanticweb.sparqlendpoint-${platform.version}.jar
 
reference:file:amdatu-application/org.amdatu.authorization.logingadget-${platform.version}.jar
+felix.auto.start.20=reference:file:amdatu-examples/org.amdatu.example.friendsgadget-${platform.version}.jar
 
reference:file:amdatu-examples/org.amdatu.example.coursegadget-${platform.version}.jar
 
reference:file:amdatu-examples/org.amdatu.example.courseservice-${platform.version}.jar
 
 # Sets the initial start level of the framework upon startup.
-org.osgi.framework.startlevel.beginning=40
+org.osgi.framework.startlevel.beginning=30
 
 # Sets the start level of newly installed bundles.
-felix.startlevel.bundle=40
+felix.startlevel.bundle=30
 
 # Felix installs a stream and content handler factories by default,
 # uncomment the following line to not install them.
@@ -104,7 +102,7 @@
 felix.fileinstall.bundles.new.start=true
 felix.fileinstall.filter=.*
 
felix.fileinstall.tmpdir=${work.directory.name}/tmp/web/org/apache/felix/fileinstall
-felix.fileinstall.start.level=40
+felix.fileinstall.start.level=30
 
 # Skype runs on port 80, Oracle db on 8080. Therefore use this 'arbitrary' port
 # Provides properties for the HTTP service (Felix HTTP Bundle or Pax Web)

Reply via email to