clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1538065 - in /clerezza/trunk: parent/ provisioning/ provisioning/jaxrs-whiteboard/ provisioning/jaxrs-whiteboard/src/ provisioning/jaxrs-whiteboard/src/main/ provisioning/jaxrs-whiteboard/src/main/feature/ provisioning/rdf/ provisioning/sl...
Date Fri, 01 Nov 2013 21:24:26 GMT
Author: reto
Date: Fri Nov  1 21:24:25 2013
New Revision: 1538065

URL: http://svn.apache.org/r1538065
Log:
CLEREZZA-815: using wymiwyg plugin fork

Added:
    clerezza/trunk/provisioning/jaxrs-whiteboard/
    clerezza/trunk/provisioning/jaxrs-whiteboard/pom.xml
    clerezza/trunk/provisioning/jaxrs-whiteboard/src/
    clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/
    clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/feature/
    clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml
    clerezza/trunk/provisioning/pom.xml
      - copied, changed from r1537571, clerezza/trunk/ext/pom.xml
Removed:
    clerezza/trunk/provisioning/tools/
Modified:
    clerezza/trunk/parent/pom.xml
    clerezza/trunk/provisioning/rdf/pom.xml
    clerezza/trunk/provisioning/sling-launcher/   (props changed)
    clerezza/trunk/provisioning/sling-launcher/pom.xml
    clerezza/trunk/provisioning/typehandlerspace/pom.xml

Modified: clerezza/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/parent/pom.xml?rev=1538065&r1=1538064&r2=1538065&view=diff
==============================================================================
--- clerezza/trunk/parent/pom.xml (original)
+++ clerezza/trunk/parent/pom.xml Fri Nov  1 21:24:25 2013
@@ -251,6 +251,20 @@
                         </lifecycleMappingMetadata>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.wymiwyg.karaf.tooling</groupId>
+                    <artifactId>karaf-sling-maven-plugin</artifactId>
+                    <version>3.0.0.RC1</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <startLevel>25</startLevel>
+                        <aggregateFeatures>true</aggregateFeatures>
+                        <resolver>(obr)</resolver>
+                        <checkDependencyChange>false</checkDependencyChange>
+                        <includeTransitiveDependency>false</includeTransitiveDependency>
+                        <createSlingPartialBundleList>true</createSlingPartialBundleList>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -336,6 +350,7 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

Added: clerezza/trunk/provisioning/jaxrs-whiteboard/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/provisioning/jaxrs-whiteboard/pom.xml?rev=1538065&view=auto
==============================================================================
--- clerezza/trunk/provisioning/jaxrs-whiteboard/pom.xml (added)
+++ clerezza/trunk/provisioning/jaxrs-whiteboard/pom.xml Fri Nov  1 21:24:25 2013
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>clerezza</artifactId>
+        <groupId>org.apache.clerezza</groupId>
+        <version>0.5-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+
+    <groupId>org.apache.clerezza.provisioning</groupId>
+    <artifactId>jaxrs</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>Clerezza - Provisioning - JAX-RS Whiteboard</name>
+    <description>Clerezza - Provisioning: Provides JAXRS with OSGi whiteboard 
+        registration.</description>
+
+    <dependencies>
+ 
+        <!-- this is currently in the stanbol ng branch -->
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.stanbol</groupId>
+            <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.stanbol</groupId>
+            <artifactId>org.apache.stanbol.commons.web.base.jersey</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-common</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <!-- if your container implements Servlet API older than 3.0, 
+            use "jersey-container-servlet-core", otherwise
+            "jersey-container-servlet"        -->
+            <artifactId>jersey-container-servlet-core</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-api</artifactId>
+            <version>2.2.0-b15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-locator</artifactId>
+            <version>2.2.0-b15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>hk2-utils</artifactId>
+            <version>2.2.0-b15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2</groupId>
+            <artifactId>osgi-resource-locator</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>2.1.88</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>asm-all-repackaged</artifactId>
+            <version>2.1.88</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>cglib</artifactId>
+            <version>2.1.88</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>1.1.0.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>14.0.1</version>
+        </dependency>
+        <dependency> <!-- for xml.bind.annotation -->
+            <groupId>org.apache.stanbol</groupId>
+            <artifactId>org.apache.stanbol.commons.frameworkfragment</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.2</version>
+        </dependency>
+        
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wymiwyg.karaf.tooling</groupId>
+                <artifactId>karaf-sling-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

Added: clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml?rev=1538065&view=auto
==============================================================================
--- clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml (added)
+++ clerezza/trunk/provisioning/jaxrs-whiteboard/src/main/feature/feature.xml Fri Nov  1 21:24:25
2013
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
+
+    <feature name='${project.artifactId}' description='${project.name}' version='${project.version}'>
+        <details>${project.description}</details>
+        <!-- <config>foo=bar</config> -->
+        <bundle start-level="1">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
+    </feature>
+
+</features>
\ No newline at end of file

Copied: clerezza/trunk/provisioning/pom.xml (from r1537571, clerezza/trunk/ext/pom.xml)
URL: http://svn.apache.org/viewvc/clerezza/trunk/provisioning/pom.xml?p2=clerezza/trunk/provisioning/pom.xml&p1=clerezza/trunk/ext/pom.xml&r1=1537571&r2=1538065&rev=1538065&view=diff
==============================================================================
--- clerezza/trunk/ext/pom.xml (original)
+++ clerezza/trunk/provisioning/pom.xml Fri Nov  1 21:24:25 2013
@@ -36,18 +36,17 @@
         <relativePath>../parent</relativePath>
      </parent>
 
-    <groupId>org.apache.clerezza.ext</groupId>
-    <artifactId>org.apache.clerezza.ext.reactor</artifactId>
+    <groupId>org.apache.clerezza.provisioning</groupId>
+    <artifactId>reactor</artifactId>
     <version>1-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Apache Clerezza :: Ext Bundles :: Reactor</name>
+    <name>Apache Clerezza :: Provisioning :: Reactor</name>
 
     <modules>
-        <module>bundles-pom</module>
-        <module>jena-iri</module>
-        <module>jena-core</module>
-        <module>jena-arq</module>
-        <module>jena-tdb</module>
+        <module>jaxrs-whiteboard</module>
+        <module>rdf</module>
+        <module>typehandlerspace</module>
+        <module>sling-launcher</module>
     </modules>
 
 </project>
\ No newline at end of file

Modified: clerezza/trunk/provisioning/rdf/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/provisioning/rdf/pom.xml?rev=1538065&r1=1538064&r2=1538065&view=diff
==============================================================================
--- clerezza/trunk/provisioning/rdf/pom.xml (original)
+++ clerezza/trunk/provisioning/rdf/pom.xml Fri Nov  1 21:24:25 2013
@@ -117,6 +117,11 @@
             <version>0.4-SNAPSHOT</version>
         </dependency>
         <dependency>
+            <groupId>org.apache.clerezza.ext</groupId>
+            <artifactId>org.json.simple</artifactId>
+            <version>0.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.clerezza</groupId>
             <artifactId>rdf.jena.sparql</artifactId>
             <version>0.7-SNAPSHOT</version>
@@ -144,28 +149,10 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.clerezza.provisionig.tooling</groupId>
-                    <artifactId>karaf-maven-plugin</artifactId>
-                    <version>3.0.0.RC1</version>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.apache.clerezza.provisionig.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <configuration>
-                    <startLevel>20</startLevel>
-                    <aggregateFeatures>true</aggregateFeatures>
-                    <resolver>(obr)</resolver>
-                    <checkDependencyChange>false</checkDependencyChange>
-                    <includeTransitiveDependency>false</includeTransitiveDependency>
-                    <createSlingPartialBundleList>true</createSlingPartialBundleList>
-                </configuration>
+                <groupId>org.wymiwyg.karaf.tooling</groupId>
+                <artifactId>karaf-sling-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

Propchange: clerezza/trunk/provisioning/sling-launcher/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov  1 21:24:25 2013
@@ -1 +1,2 @@
 dependency-reduced-pom.xml
+target

Modified: clerezza/trunk/provisioning/sling-launcher/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/provisioning/sling-launcher/pom.xml?rev=1538065&r1=1538064&r2=1538065&view=diff
==============================================================================
--- clerezza/trunk/provisioning/sling-launcher/pom.xml (original)
+++ clerezza/trunk/provisioning/sling-launcher/pom.xml Fri Nov  1 21:24:25 2013
@@ -51,12 +51,6 @@
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-launchpad-plugin</artifactId>
-                <version>2.2.0</version>
-                <!--
-                  TODO the maven-launchpad-plugin can also generate a war file and
-                  Karaf description, we could add this. See
-                  http://sling.apache.org/site/maven-launchpad-plugin.html
-                -->
                 <executions>
                     <execution>
                         <id>prepare-package</id>
@@ -126,7 +120,7 @@
                 <plugin>
                     <groupId>org.apache.sling</groupId>
                     <artifactId>maven-launchpad-plugin</artifactId>
-                    <version>2.1.0</version>
+                    <version>2.2.0</version>
                     <extensions>true</extensions>
                 </plugin>
                 <!-- generates version number of dependencies suitable for introspection
@@ -206,7 +200,7 @@
 
     <dependencies>
         <dependency>
-            <!-- The Apache Stanbol lauchpad -->
+            <!-- The Apache Stanbol launchpad -->
             <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.commons.launchpad</artifactId>
             <version>0.11.0</version>
@@ -222,7 +216,7 @@
         <dependency>
             <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId>
-            <version>0.9.0-incubating</version>
+            <version>1.0.0-SNAPSHOT</version>
             <type>partialbundlelist</type>
         </dependency>
         <dependency>
@@ -233,12 +227,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>jaxrs</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
             <artifactId>typehandlerspace</artifactId>
             <version>0.1-SNAPSHOT</version>
             <type>partialbundlelist</type>
         </dependency>
-        
-    
     </dependencies>
   
   

Modified: clerezza/trunk/provisioning/typehandlerspace/pom.xml
URL: http://svn.apache.org/viewvc/clerezza/trunk/provisioning/typehandlerspace/pom.xml?rev=1538065&r1=1538064&r2=1538065&view=diff
==============================================================================
--- clerezza/trunk/provisioning/typehandlerspace/pom.xml (original)
+++ clerezza/trunk/provisioning/typehandlerspace/pom.xml Fri Nov  1 21:24:25 2013
@@ -54,11 +54,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.stanbol</groupId>
-            <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.stanbol</groupId>
             <artifactId>org.apache.stanbol.commons.web.base</artifactId>
             <version>1.0.0-SNAPSHOT</version>
         </dependency>
@@ -162,28 +157,10 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.wymiwyg.karaf.tooling</groupId>
-                    <artifactId>karaf-sling-maven-plugin</artifactId>
-                    <version>3.0.0.RC1</version>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.wymiwyg.karaf.tooling</groupId>
                 <artifactId>karaf-sling-maven-plugin</artifactId>
-                <configuration>
-                    <startLevel>25</startLevel>
-                    <aggregateFeatures>true</aggregateFeatures>
-                    <resolver>(obr)</resolver>
-                    <checkDependencyChange>false</checkDependencyChange>
-                    <includeTransitiveDependency>false</includeTransitiveDependency>
-                    <createSlingPartialBundleList>true</createSlingPartialBundleList>
-                </configuration>
             </plugin>
         </plugins>
     </build>



Mime
View raw message