You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2013/12/31 19:12:12 UTC

[1/5] git commit: added nbactions.xml

Updated Branches:
  refs/heads/master 12f839d90 -> 416fa7502


added nbactions.xml

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f9f95bab
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f9f95bab
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f9f95bab

Branch: refs/heads/master
Commit: f9f95bab671d0c10a3f738a0b4a0c4de533fd8d4
Parents: 12f839d
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 10:40:25 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 10:40:25 2013 +0100

----------------------------------------------------------------------
 platform.typerendering.scalaserverpages/nbactions.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/f9f95bab/platform.typerendering.scalaserverpages/nbactions.xml
----------------------------------------------------------------------
diff --git a/platform.typerendering.scalaserverpages/nbactions.xml b/platform.typerendering.scalaserverpages/nbactions.xml
new file mode 100644
index 0000000..9690e1a
--- /dev/null
+++ b/platform.typerendering.scalaserverpages/nbactions.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+  <action>
+    <actionName>CUSTOM-deploy to localhost:8080</actionName>
+    <displayName>deploy to localhost:8080</displayName>
+    <goals>
+      <goal>install</goal>
+      <goal>org.apache.sling:maven-sling-plugin:install</goal>
+    </goals>
+  </action>
+</actions>


[3/5] git commit: added dependency-reduced-pom.xml to .gitignore

Posted by re...@apache.org.
added dependency-reduced-pom.xml to .gitignore


Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/335a3cbd
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/335a3cbd
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/335a3cbd

Branch: refs/heads/master
Commit: 335a3cbd9c9a37bcd079e83af073ef50b9b7ce83
Parents: a83d542
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 19:06:59 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 19:06:59 2013 +0100

----------------------------------------------------------------------
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/335a3cbd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 27dab2a..3b3840a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ target/
 .cache
 .project
 .classpath
+dependency-reduced-pom.xml
 


[2/5] git commit: CLEREZZA-815: added rdf.scala.utils as this is needed by scala typerenderlet and ScalaSeverPages

Posted by re...@apache.org.
CLEREZZA-815: added rdf.scala.utils as this is needed by scala typerenderlet and ScalaSeverPages

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/a83d5423
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/a83d5423
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/a83d5423

Branch: refs/heads/master
Commit: a83d5423268df41a8f8804d1562c830044c4fc6a
Parents: f9f95ba
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 10:54:57 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 10:54:57 2013 +0100

----------------------------------------------------------------------
 provisioning/typerendering/pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/a83d5423/provisioning/typerendering/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/typerendering/pom.xml b/provisioning/typerendering/pom.xml
index 7cfce5e..09680c7 100644
--- a/provisioning/typerendering/pom.xml
+++ b/provisioning/typerendering/pom.xml
@@ -37,7 +37,8 @@
     <packaging>feature</packaging>
 
     <name>Clerezza - Provisioning - Typerendering</name>
-    <description>Clerezza - Provisioning: What's needed to get typerenering working.
+    <description>Clerezza - Provisioning: What's needed to get typerenering working,
+        including support for ScalaServerPages.
         It depends on the Clerezza rdf libraries as provided by the RDF feature, 
         on JAX-RS and on platform.graphnodeprovider..</description>
 
@@ -99,6 +100,13 @@
             <version>0.2-SNAPSHOT</version>
         </dependency>
         
+        <!-- needed by scalaservepages and typesrendering.scala -->
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>rdf.scala.utils</artifactId>
+            <version>0.4-SNAPSHOT</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.clerezza.scala</groupId>
             <artifactId>script-engine</artifactId>


[5/5] git commit: CLEREZZA-815: adding new launcher containg linked data/ rdf.web functionality (but no shell)

Posted by re...@apache.org.
CLEREZZA-815: adding new launcher containg linked data/ rdf.web functionality (but no shell)

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/416fa750
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/416fa750
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/416fa750

Branch: refs/heads/master
Commit: 416fa75028fae005d968bd2c60d51f38ca174454
Parents: 1211199
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 19:11:27 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 19:11:27 2013 +0100

----------------------------------------------------------------------
 .../full-launcher/dependency-reduced-pom.xml    | 275 -------------------
 provisioning/launchers/full-launcher/pom.xml    |   8 +-
 .../linked-data-launcher/nbactions.xml          |  50 ++++
 .../launchers/linked-data-launcher/pom.xml      | 272 ++++++++++++++++++
 .../src/main/bundles/list.xml                   |   5 +
 .../src/main/config/note.txt                    |   1 +
 provisioning/launchers/pom.xml                  |  51 ++++
 provisioning/launchers/shell-launcher/pom.xml   |   2 +-
 provisioning/pom.xml                            | 113 ++++----
 provisioning/rdf/pom.xml                        |  10 +
 10 files changed, 454 insertions(+), 333 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/full-launcher/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/full-launcher/dependency-reduced-pom.xml b/provisioning/launchers/full-launcher/dependency-reduced-pom.xml
deleted file mode 100644
index b795d79..0000000
--- a/provisioning/launchers/full-launcher/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>clerezza</artifactId>
-    <groupId>org.apache.clerezza</groupId>
-    <version>0.5-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.clerezza.provisioning</groupId>
-  <artifactId>full-launcher</artifactId>
-  <name>Clerezza - Sling Based Standalone Launcher</name>
-  <version>0.1-SNAPSHOT</version>
-  <description>Runnable jar using all the clerezza partial bundlelists.
-    Note that this is not (yet) as complete as the clerezza platform tdb launcher.</description>
-  <prerequisites>
-    <maven>3.0.2</maven>
-  </prerequisites>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.sling</groupId>
-          <artifactId>maven-launchpad-plugin</artifactId>
-          <version>2.2.0</version>
-          <extensions>true</extensions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.servicemix.tooling</groupId>
-          <artifactId>depends-maven-plugin</artifactId>
-          <version>1.0</version>
-          <executions>
-            <execution>
-              <id>generate-depends-file</id>
-              <goals>
-                <goal>generate-depends-file</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
-          <configuration>
-            <target>
-              <property />
-              <java>
-                <jvmarg />
-              </java>
-            </target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>.</directory>
-              <includes>
-                <include>stanbol/**</include>
-                <include>*.log</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>maven-launchpad-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>prepare-package</id>
-            <goals>
-              <goal>prepare-package</goal>
-            </goals>
-            <configuration>
-              <includeDefaultBundles>false</includeDefaultBundles>
-              <jarWebSupport>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.http.jetty</artifactId>
-                <version>2.2.1</version>
-              </jarWebSupport>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <addClasspath>true</addClasspath>
-              <mainClass>org.apache.stanbol.launchpad.Main</mainClass>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
-                  <include>org.apache.sling:org.apache.sling.launchpad.base</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes />
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>felixosgi</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>felixweb</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>shell</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>rdf</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>platform.graphnodeprovider</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>jaxrs</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>typehandlerspace</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.clerezza.provisioning</groupId>
-      <artifactId>typerendering</artifactId>
-      <version>0.1-SNAPSHOT</version>
-      <type>partialbundlelist</type>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.launchpad</artifactId>
-      <version>RELEASE</version>
-      <type>xml</type>
-      <classifier>bundlelist</classifier>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.http.jetty</artifactId>
-      <version>RELEASE</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>jetty-servlet</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-server</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-util</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-jmx</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-security</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jetty-webapp</artifactId>
-          <groupId>org.eclipse.jetty</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>org.apache.felix.http.api</artifactId>
-          <groupId>org.apache.felix</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>org.apache.felix.http.base</artifactId>
-          <groupId>org.apache.felix</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>org.apache.sling.launchpad.base</artifactId>
-        <version>2.5.0</version>
-        <classifier>app</classifier>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>org.apache.sling.launchpad.base</artifactId>
-        <version>2.5.0</version>
-        <type>war</type>
-        <classifier>webapp</classifier>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>org.apache.sling.launchpad.installer</artifactId>
-        <version>1.2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>org.apache.sling.launchpad.api</artifactId>
-        <version>1.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>org.apache.sling.installer.api</artifactId>
-        <version>1.0.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sling</groupId>
-        <artifactId>org.apache.sling.installer.core</artifactId>
-        <version>3.4.6</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
-

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/full-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/full-launcher/pom.xml b/provisioning/launchers/full-launcher/pom.xml
index 30ec936..6fadaf8 100644
--- a/provisioning/launchers/full-launcher/pom.xml
+++ b/provisioning/launchers/full-launcher/pom.xml
@@ -28,7 +28,7 @@
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Clerezza - Sling Based Standalone Launcher</name>
+    <name>Clerezza - Launcher: Full (sling based)</name>
     <description>Runnable jar using all the clerezza partial bundlelists.
     Note that this is not (yet) as complete as the clerezza platform tdb launcher.</description>
 
@@ -266,6 +266,12 @@
             <version>0.1-SNAPSHOT</version>
             <type>partialbundlelist</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>rdf.web</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
     </dependencies>
   
   

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/linked-data-launcher/nbactions.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/linked-data-launcher/nbactions.xml b/provisioning/launchers/linked-data-launcher/nbactions.xml
new file mode 100644
index 0000000..101fb77
--- /dev/null
+++ b/provisioning/launchers/linked-data-launcher/nbactions.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+  <action>
+    <actionName>run</actionName>
+    <goals>
+      <goal>clean</goal>
+      <goal>package</goal>
+      <goal>antrun:run</goal>
+      <goal>-o</goal>
+    </goals>
+  </action>
+  <action>
+    <actionName>debug</actionName>
+    <goals>
+      <goal>clean</goal>
+      <goal>package</goal>
+      <goal>antrun:run</goal>
+      <goal>-o</goal>
+    </goals>
+    <properties>
+      <vm.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</vm.args>
+      <jpda.listen>true</jpda.listen>
+    </properties>
+  </action>
+  <action>
+    <actionName>profile</actionName>
+    <goals>
+      <goal>clean</goal>
+      <goal>package</goal>
+      <goal>antrun:run</goal>
+      <goal>-o</goal>
+    </goals>
+    <properties>
+      <vm.args>${profiler.args}</vm.args>
+      <!-- XXX <java jvm="${profiler.java}" ...> -->
+      <profiler.action>profile</profiler.action>
+    </properties>
+  </action>
+  <action>
+        <actionName>CUSTOM-resume-debug</actionName>
+        <displayName>Resume Debug</displayName>
+        <goals>
+            <goal>antrun:run</goal>
+        </goals>
+        <properties>
+            <vm.args>-Xdebug -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address}</vm.args>
+            <jpda.listen>true</jpda.listen>
+        </properties>
+    </action>
+</actions>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/linked-data-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/linked-data-launcher/pom.xml b/provisioning/launchers/linked-data-launcher/pom.xml
new file mode 100644
index 0000000..0f5ceaf
--- /dev/null
+++ b/provisioning/launchers/linked-data-launcher/pom.xml
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright 2012 Fusepool.eu Project Partners
+
+   Licensed 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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.clerezza</groupId>
+        <artifactId>clerezza</artifactId>
+        <version>0.5-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+    </parent>
+    <groupId>org.apache.clerezza.provisioning</groupId>
+    <artifactId>linked-data-launcher</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>Clerezza - Launcher: Core Linked Data</name>
+    <description>Runnable jar using the clerezza partial bundlelists for Web
+        access to the RDF Data.</description>
+
+    <prerequisites>
+      <maven>3.0.2</maven>
+    </prerequisites>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>.</directory>
+                            <includes>
+                                <include>stanbol/**</include>
+                                <include>*.log</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>maven-launchpad-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>prepare-package</id>
+                        <goals>
+                            <goal>prepare-package</goal>
+                        </goals>
+                        <configuration>
+                            <includeDefaultBundles>false</includeDefaultBundles>
+                            <!-- Standalone jar requires an OSGi http service implementation -->
+                            <jarWebSupport>
+                                <groupId>org.apache.felix</groupId>
+                                <artifactId>org.apache.felix.http.jetty</artifactId>
+                                <version>2.2.1</version>
+                            </jarWebSupport>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>org.apache.stanbol.launchpad.Main</mainClass>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <!-- Use this to in/exclude only specific dependencies -->
+                                <includes>
+                                    <include>org.apache.stanbol:org.apache.stanbol.commons.launchpad</include>
+                                    <include>org.apache.sling:org.apache.sling.launchpad.base</include>
+                                </includes>
+                            </artifactSet>
+                            <!-- transformers>
+                              <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
+                            </transformers -->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes></excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>maven-launchpad-plugin</artifactId>
+                    <version>2.2.0</version>
+                    <extensions>true</extensions>
+                </plugin>
+                <!-- generates version number of dependencies suitable for introspection
+                in pax-exam based OSGi lightweight-integration tests -->
+                <plugin>
+                    <groupId>org.apache.servicemix.tooling</groupId>
+                    <artifactId>depends-maven-plugin</artifactId>
+                    <version>1.0</version>
+                    <executions>
+                        <execution>
+                            <id>generate-depends-file</id>
+                            <goals>
+                                <goal>generate-depends-file</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.7</version>
+                    <configuration>
+                        <target>
+                            <property name="vm.args" value=""/>
+                            <java fork="true" jar="${project.build.directory}/${project.build.finalName}.jar"
+                    dir="${project.build.directory}">
+                                <jvmarg line="-Xmx1024m -XX:MaxPermSize=256M ${vm.args}"/>
+                            </java>
+                        </target>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Sling -->
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.launchpad.base</artifactId>
+                <version>2.5.0</version>
+                <classifier>app</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.launchpad.base</artifactId>
+                <version>2.5.0</version>
+                <classifier>webapp</classifier>
+                <type>war</type>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.launchpad.installer</artifactId>
+                <version>1.2.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.launchpad.api</artifactId>
+                <version>1.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.installer.api</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.sling</groupId>
+                <artifactId>org.apache.sling.installer.core</artifactId>
+                <version>3.4.6</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+
+    <dependencies>
+        <dependency>
+            <!-- The Apache Stanbol launchpad -->
+            <groupId>org.apache.stanbol</groupId>
+            <artifactId>org.apache.stanbol.commons.launchpad</artifactId>
+            <version>0.11.0</version>
+        </dependency>
+        <dependency>
+            <!-- maven-launchpad-plugin builds on the launchpad.base app -->
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.base</artifactId>
+            <classifier>app</classifier>
+        </dependency>
+    
+        <!-- BundeLists -->
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>felixosgi</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>felixweb</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>rdf</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>platform.graphnodeprovider</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </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>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>typerendering</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>rdf.web</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
+    </dependencies>
+  
+  
+</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/linked-data-launcher/src/main/bundles/list.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/linked-data-launcher/src/main/bundles/list.xml b/provisioning/launchers/linked-data-launcher/src/main/bundles/list.xml
new file mode 100644
index 0000000..1098261
--- /dev/null
+++ b/provisioning/launchers/linked-data-launcher/src/main/bundles/list.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bundles>
+    <startLevel level="1">
+    </startLevel>
+</bundles>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/linked-data-launcher/src/main/config/note.txt
----------------------------------------------------------------------
diff --git a/provisioning/launchers/linked-data-launcher/src/main/config/note.txt b/provisioning/launchers/linked-data-launcher/src/main/config/note.txt
new file mode 100644
index 0000000..eb01c8c
--- /dev/null
+++ b/provisioning/launchers/linked-data-launcher/src/main/config/note.txt
@@ -0,0 +1 @@
+Sling launchpad plugin requires this directory
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/pom.xml b/provisioning/launchers/pom.xml
new file mode 100644
index 0000000..d3a1ce7
--- /dev/null
+++ b/provisioning/launchers/pom.xml
@@ -0,0 +1,51 @@
+<?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/maven-v4_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.
+    -->
+
+    <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+         !!!!!!                                !!!!!!
+         !!!!!!    This pom is only provided   !!!!!!
+         !!!!!!   for build convenience and    !!!!!!
+         !!!!!!   should not be released       !!!!!!
+         !!!!!!                                !!!!!!
+         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.clerezza</groupId>
+        <artifactId>clerezza</artifactId>
+        <version>0.5-SNAPSHOT</version>
+        <relativePath>../../parent</relativePath>
+     </parent>
+
+    <groupId>org.apache.clerezza.provisioning</groupId>
+    <artifactId>launchers-reactor</artifactId>
+    <version>1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Clerezza - Provisioning - Launchers - Reactor</name>
+
+    <modules>
+        <module>linked-data-launcher</module>
+        <module>shell-launcher</module>
+        <module>full-launcher</module>
+    </modules>
+
+</project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/launchers/shell-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/shell-launcher/pom.xml b/provisioning/launchers/shell-launcher/pom.xml
index f156dfd..18c7298 100644
--- a/provisioning/launchers/shell-launcher/pom.xml
+++ b/provisioning/launchers/shell-launcher/pom.xml
@@ -28,7 +28,7 @@
     <version>0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Clerezza - Shell only Launcher</name>
+    <name>Clerezza - Launcher: Shell only</name>
     <description>Runnable jar using the clerezza partial bundlelists.</description>
 
     <prerequisites>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/pom.xml b/provisioning/pom.xml
index 82690ad..6d8ae82 100644
--- a/provisioning/pom.xml
+++ b/provisioning/pom.xml
@@ -1,57 +1,58 @@
-<?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/maven-v4_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.
-    -->
-
-    <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-         !!!!!!                                !!!!!!
-         !!!!!!    This pom is only provided   !!!!!!
-         !!!!!!   for build convenience and    !!!!!!
-         !!!!!!   should not be released       !!!!!!
-         !!!!!!                                !!!!!!
-         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-
-    <modelVersion>4.0.0</modelVersion>
-    
-    <parent>
-        <groupId>org.apache.clerezza</groupId>
-        <artifactId>clerezza</artifactId>
-        <version>0.5-SNAPSHOT</version>
-        <relativePath>../parent</relativePath>
-     </parent>
-
-    <groupId>org.apache.clerezza.provisioning</groupId>
-    <artifactId>reactor</artifactId>
-    <version>1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Apache Clerezza - Provisioning - Reactor</name>
-
-    <modules>
-        <module>felixosgi</module>
-        <module>felixweb</module>
-        <module>jaxrs-whiteboard</module>
-        <module>rdf</module>
-        <module>platform.graphnodeprovider</module>
-        <module>typehandlerspace</module>
-        <module>typerendering</module>
-        <module>launchers/shell-launcher</module>
-        <module>launchers/full-launcher</module>
-    </modules>
-
+<?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/maven-v4_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.
+    -->
+
+    <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+         !!!!!!                                !!!!!!
+         !!!!!!    This pom is only provided   !!!!!!
+         !!!!!!   for build convenience and    !!!!!!
+         !!!!!!   should not be released       !!!!!!
+         !!!!!!                                !!!!!!
+         !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.clerezza</groupId>
+        <artifactId>clerezza</artifactId>
+        <version>0.5-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
+     </parent>
+
+    <groupId>org.apache.clerezza.provisioning</groupId>
+    <artifactId>reactor</artifactId>
+    <version>1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Clerezza - Provisioning - Reactor</name>
+
+    <modules>
+        <module>felixosgi</module>
+        <module>felixweb</module>
+        <module>jaxrs-whiteboard</module>
+        <module>rdf</module>
+        <module>platform.graphnodeprovider</module>
+        <module>typehandlerspace</module>
+        <module>typerendering</module>
+        <module>rdf.web</module>
+        <module>shell</module>
+        <module>launchers</module>
+    </modules>
+
 </project>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/clerezza/blob/416fa750/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index d57dbbb..3b853fb 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -161,6 +161,16 @@
             <artifactId>org.apache.jena.jena-tdb</artifactId>
             <version>1.0.0_1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+            <version>1.2_5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
+            <version>2.11.0_1</version>
+        </dependency>
     </dependencies>
 
     <build>


[4/5] git commit: CLEREZZA-815: added jena-tdb xml dependencies

Posted by re...@apache.org.
CLEREZZA-815: added jena-tdb xml dependencies

Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/12111999
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/12111999
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/12111999

Branch: refs/heads/master
Commit: 12111999e84ed37c18649ec63c496d2fd39ea382
Parents: 335a3cb
Author: retobg <re...@apache.org>
Authored: Tue Dec 31 19:10:10 2013 +0100
Committer: retobg <re...@apache.org>
Committed: Tue Dec 31 19:10:10 2013 +0100

----------------------------------------------------------------------
 provisioning/rdf.web/pom.xml                    | 96 ++++++++++++++++++++
 .../rdf.web/src/main/feature/feature.xml        | 26 ++++++
 2 files changed, 122 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/12111999/provisioning/rdf.web/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.web/pom.xml b/provisioning/rdf.web/pom.xml
new file mode 100644
index 0000000..a58e240
--- /dev/null
+++ b/provisioning/rdf.web/pom.xml
@@ -0,0 +1,96 @@
+<?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>rdf.web</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>Clerezza - Provisioning - RDF Web</name>
+    <description>A Karaf feature and partialbundlelist with the bundles providing 
+        web access to the Clerezza RDF stores.
+    
+        This feature depends on java and OSGi platform libraries (javax.xml,
+        org.osgi.service.cm and others), slf4j logging
+        - typerendering?
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>rdf.web.core</artifactId>
+            <version>0.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>rdf.web.ontologies</artifactId>
+            <version>0.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>jaxrs.utils</artifactId>
+            <version>0.9-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>platform.dashboard.core</artifactId>
+            <version>0.3-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>platform.dashboard.ontologies</artifactId>
+            <version>0.3-SNAPSHOT</version>
+        </dependency>
+        <!-- Required by DashBoard's UserLoginNode -->
+        <dependency>
+            <groupId>org.apache.stanbol</groupId>
+            <artifactId>org.apache.stanbol.commons.security.core</artifactId>
+            <version>0.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>web.fileserver</artifactId>
+            <version>0.10-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wymiwyg.karaf.tooling</groupId>
+                <artifactId>karaf-sling-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/12111999/provisioning/rdf.web/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.web/src/main/feature/feature.xml b/provisioning/rdf.web/src/main/feature/feature.xml
new file mode 100644
index 0000000..9b0f399
--- /dev/null
+++ b/provisioning/rdf.web/src/main/feature/feature.xml
@@ -0,0 +1,26 @@
+<?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> -->
+    </feature>
+
+</features>
\ No newline at end of file