[Amdatu-commits] SVN r723 - in branches/amdatu-dispatcher: amdatu-release src/main/resources/conf

[subvers...@amdatu.org]

Author: bdekruijff at gmail.com
Date: Mon Jan 31 11:25:23 2011
New Revision: 723

Log:
AMDATU-245 added resource/dispatcher and removed whiteboard from devserver 
assembly

Modified:
   branches/amdatu-dispatcher/amdatu-release/pom.xml
   branches/amdatu-dispatcher/src/main/resources/conf/felix-config.properties

Modified: branches/amdatu-dispatcher/amdatu-release/pom.xml
==============================================================================
--- branches/amdatu-dispatcher/amdatu-release/pom.xml   (original)
+++ branches/amdatu-dispatcher/amdatu-release/pom.xml   Mon Jan 31 11:25:23 2011
@@ -271,6 +271,20 @@
     </dependency>
     <dependency>
       <groupId>org.amdatu.web</groupId>
+      <artifactId>dispatcher</artifactId>
+      <version>${platform.version}</version>
+      <scope>runtime</scope>
+      <type>bundle</type>
+    </dependency>
+    <dependency>
+      <groupId>org.amdatu.web</groupId>
+      <artifactId>resource</artifactId>
+      <version>${platform.version}</version>
+      <scope>runtime</scope>
+      <type>bundle</type>
+    </dependency>
+    <dependency>
+      <groupId>org.amdatu.web</groupId>
       <artifactId>jsp</artifactId>
       <version>${platform.version}</version>
       <scope>compile</scope>

Modified: 
branches/amdatu-dispatcher/src/main/resources/conf/felix-config.properties
==============================================================================
--- branches/amdatu-dispatcher/src/main/resources/conf/felix-config.properties  
(original)
+++ branches/amdatu-dispatcher/src/main/resources/conf/felix-config.properties  
Mon Jan 31 11:25:23 2011
@@ -92,7 +92,6 @@
           reference:file:amdatu-system/org.osgi.core-${org.osgi.version}.jar \
           
reference:file:amdatu-system/pax-useradmin-service-0.0.1-SNAPSHOT.jar \
           
reference:file:amdatu-system/org.apache.felix.http.jetty-${org.apache.felix.http.version}.jar
 \
-          
reference:file:amdatu-system/org.apache.felix.http.whiteboard-${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 \
@@ -117,6 +116,8 @@
           
reference:file:amdatu-application/org.amdatu.authentication.tokenprovider-${platform.version}.jar
 \
           
reference:file:amdatu-application/org.amdatu.authentication.tokenstore.mem-${platform.version}.jar
 \
           
reference:file:amdatu-application/org.amdatu.web.httpcontext-${platform.version}.jar
 \
+          
reference:file:amdatu-application/org.amdatu.web.dispatcher-${platform.version}.jar
 \
+          
reference:file:amdatu-application/org.amdatu.web.resource-${platform.version}.jar
 \
           
reference:file:amdatu-application/org.amdatu.web.jsp-${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
 \