You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/08/19 15:33:00 UTC
svn commit: r1159632 - in /karaf/sandbox/jbonofre/cave/trunk: assembly/
assembly/src/main/resources/
server/rest/src/main/java/org/apache/karaf/cave/server/rest/
server/rest/src/main/resources/OSGI-INF/blueprint/
Author: jbonofre
Date: Fri Aug 19 13:32:59 2011
New Revision: 1159632
URL: http://svn.apache.org/viewvc?rev=1159632&view=rev
Log:
Change the default context path of the service.
Inject the Cave repository service in blueprint.
Added:
karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/cxf.cfg
Modified:
karaf/sandbox/jbonofre/cave/trunk/assembly/pom.xml
karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveService.java
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml
Modified: karaf/sandbox/jbonofre/cave/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/assembly/pom.xml?rev=1159632&r1=1159631&r2=1159632&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/assembly/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/assembly/pom.xml Fri Aug 19 13:32:59 2011
@@ -87,6 +87,11 @@
<type>cfg</type>
<classifier>filesystem</classifier>
</artifact>
+ <artifact>
+ <file>target/classes/cxf.cfg</file>
+ <type>cfg</type>
+ <classifier>cxf</classifier>
+ </artifact>
</artifacts>
</configuration>
</execution>
Added: karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/cxf.cfg
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/cxf.cfg?rev=1159632&view=auto
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/cxf.cfg (added)
+++ karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/cxf.cfg Fri Aug 19 13:32:59 2011
@@ -0,0 +1 @@
+org.apache.cxf.servlet.context=/services
\ No newline at end of file
Modified: karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml?rev=1159632&r1=1159631&r2=1159632&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml Fri Aug 19 13:32:59 2011
@@ -33,6 +33,9 @@
</feature>
<feature name="cave-server-rest" version="${project.version}">
+ <configfile finalname="/etc/org.apache.cxf.osgi.cfg">
+ mvn:org.apache.karaf.cave/apache-karaf-cave/${project.version}/cfg/cxf
+ </configfile>
<feature version="[2.4.2,3)">cxf</feature>
<feature version="${project.version}">cave-server</feature>
<bundle>mvn:org.apache.karaf.cave.server/org.apache.karaf.cave.server.rest/${project.version}</bundle>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveService.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveService.java?rev=1159632&r1=1159631&r2=1159632&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveService.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/java/org/apache/karaf/cave/server/rest/CaveService.java Fri Aug 19 13:32:59 2011
@@ -80,7 +80,7 @@ public class CaveService {
}
/**
- * A wrapper to the Karaf Cave repository to exchange with the REST client.
+ * A wrapper to the Karaf Cave repository list to exchange with the REST client.
*/
public static class CaveRepositoriesWrapper {
@@ -96,6 +96,9 @@ public class CaveService {
}
+ /**
+ * A weapper to the Karaf Cave repository to exchange with the REST client.
+ */
public static class CaveRepositoryWrapper {
private final String name;
Modified: karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml?rev=1159632&r1=1159631&r2=1159632&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml Fri Aug 19 13:32:59 2011
@@ -17,12 +17,16 @@
</cxf:features>
</cxf:bus>
- <jaxrs:server id="caveService" address="/cave">
+ <jaxrs:server id="caveService" address="/cave">
<jaxrs:serviceBeans>
- <ref component-id="caveServiceBean" />
+ <ref component-id="caveServiceBean"/>
</jaxrs:serviceBeans>
- </jaxrs:server>
+ </jaxrs:server>
- <bean id="caveServiceBean" class="org.apache.karaf.cave.server.rest.CaveService"/>
+ <bean id="caveServiceBean" class="org.apache.karaf.cave.server.rest.CaveService">
+ <property name="caveRepositoryService" ref="caveRepositoryService"/>
+ </bean>
+
+ <reference id="caveRepositoryService" interface="org.apache.karaf.cave.server.backend.api.CaveRepositoryService"/>
</blueprint>
\ No newline at end of file