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:01:33 UTC
svn commit: r1159620 - in /karaf/sandbox/jbonofre/cave/trunk: ./
assembly/src/main/resources/ client/ client/src/ client/src/main/
client/src/main/java/ client/src/main/java/org/
client/src/main/java/org/apache/ client/src/main/java/org/apache/karaf/ c...
Author: jbonofre
Date: Fri Aug 19 13:01:32 2011
New Revision: 1159620
URL: http://svn.apache.org/viewvc?rev=1159620&view=rev
Log:
Move the JAXRS server definition in Blueprint.
Added:
karaf/sandbox/jbonofre/cave/trunk/client/
karaf/sandbox/jbonofre/cave/trunk/client/pom.xml
karaf/sandbox/jbonofre/cave/trunk/client/src/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/client/
karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/client/RepositoryAdminProxy.java
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml
Removed:
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/WEB-INF/beans.xml
karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/WEB-INF/web.xml
Modified:
karaf/sandbox/jbonofre/cave/trunk/assembly/src/main/resources/features.xml
karaf/sandbox/jbonofre/cave/trunk/pom.xml
karaf/sandbox/jbonofre/cave/trunk/server/rest/pom.xml
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=1159620&r1=1159619&r2=1159620&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:01:32 2011
@@ -33,8 +33,8 @@
</feature>
<feature name="cave-server-rest" version="${project.version}">
- <feature>war</feature>
<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>
</feature>
Added: karaf/sandbox/jbonofre/cave/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/client/pom.xml?rev=1159620&view=auto
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/client/pom.xml (added)
+++ karaf/sandbox/jbonofre/cave/trunk/client/pom.xml Fri Aug 19 13:01:32 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>cave</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.cave</groupId>
+ <artifactId>org.apache.karaf.cave.client</artifactId>
+ <name>Apache Karaf :: Cave :: Client</name>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/client/RepositoryAdminProxy.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/client/RepositoryAdminProxy.java?rev=1159620&view=auto
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/client/RepositoryAdminProxy.java (added)
+++ karaf/sandbox/jbonofre/cave/trunk/client/src/main/java/org/apache/karaf/cave/client/RepositoryAdminProxy.java Fri Aug 19 13:01:32 2011
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.cave.client;
+
+/**
+ * Implementation of the OBR RepositoryAdmin service which proxy to a Karaf Cave server.
+ */
+public class RepositoryAdminProxy {
+}
Modified: karaf/sandbox/jbonofre/cave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/pom.xml?rev=1159620&r1=1159619&r2=1159620&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/pom.xml Fri Aug 19 13:01:32 2011
@@ -45,6 +45,7 @@
<modules>
<module>server</module>
+ <module>client</module>
<module>assembly</module>
</modules>
Modified: karaf/sandbox/jbonofre/cave/trunk/server/rest/pom.xml
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/rest/pom.xml?rev=1159620&r1=1159619&r2=1159620&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/rest/pom.xml (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/rest/pom.xml Fri Aug 19 13:01:32 2011
@@ -60,14 +60,7 @@
<Export-Package>
org.apache.karaf.cave.server.rest*;version=${project.version}
</Export-Package>
- <Import-Package>
- org.apache.karaf.cave.server.backend.api;version=${project.version},
- org.apache.felix.bundlerepository*;version="[2,3)",
- javax.ws.rs,
- *
- </Import-Package>
- <Web-ContextPath>cave</Web-ContextPath>
- <Webapp-Context>cave</Webapp-Context>
+ <Require-Bundle>org.apache.cxf.bundle,org.springframework.beans</Require-Bundle>
</instructions>
</configuration>
</plugin>
Added: 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=1159620&view=auto
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml (added)
+++ karaf/sandbox/jbonofre/cave/trunk/server/rest/src/main/resources/OSGI-INF/blueprint/rest.xml Fri Aug 19 13:01:32 2011
@@ -0,0 +1,28 @@
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.0.0"
+ xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"
+ xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/blueprint/core"
+ xsi:schemaLocation="
+ http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd
+ http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd
+ http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd
+ http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd
+ ">
+
+ <cxf:bus>
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <jaxrs:server id="caveService" address="/cave">
+ <jaxrs:serviceBeans>
+ <ref component-id="caveServiceBean" />
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <bean id="caveServiceBean" class="org.apache.karaf.cave.server.rest.CaveService"/>
+
+</blueprint>
\ No newline at end of file