clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [3/3] git commit: CLREZZA-815: added platform.content feature
Date Tue, 07 Jan 2014 14:46:14 GMT
CLREZZA-815: added platform.content feature


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

Branch: refs/heads/master
Commit: b7ec07bb4241c5644ad684419b63184932994c20
Parents: 54d1528
Author: retobg <reto@apache.org>
Authored: Tue Jan 7 15:45:15 2014 +0100
Committer: retobg <reto@apache.org>
Committed: Tue Jan 7 15:45:15 2014 +0100

----------------------------------------------------------------------
 provisioning/launchers/full-launcher/pom.xml    |   6 +
 provisioning/launchers/pom.xml                  |   1 +
 .../shell-launcher/dependency-reduced-pom.xml   | 232 -------------------
 provisioning/platform.content/pom.xml           |  80 +++++++
 .../src/main/feature/feature.xml                |  26 +++
 provisioning/pom.xml                            |   1 +
 6 files changed, 114 insertions(+), 232 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/clerezza/blob/b7ec07bb/provisioning/launchers/full-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/full-launcher/pom.xml b/provisioning/launchers/full-launcher/pom.xml
index 6fadaf8..312cf9d 100644
--- a/provisioning/launchers/full-launcher/pom.xml
+++ b/provisioning/launchers/full-launcher/pom.xml
@@ -272,6 +272,12 @@
             <version>0.1-SNAPSHOT</version>
             <type>partialbundlelist</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza.provisioning</groupId>
+            <artifactId>platform.content</artifactId>
+            <version>0.1-SNAPSHOT</version>
+            <type>partialbundlelist</type>
+        </dependency>
     </dependencies>
   
   

http://git-wip-us.apache.org/repos/asf/clerezza/blob/b7ec07bb/provisioning/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/pom.xml b/provisioning/launchers/pom.xml
index d3a1ce7..30ce531 100644
--- a/provisioning/launchers/pom.xml
+++ b/provisioning/launchers/pom.xml
@@ -43,6 +43,7 @@
     <name>Clerezza - Provisioning - Launchers - Reactor</name>
 
     <modules>
+        <module>typerendering-launcher</module>
         <module>linked-data-launcher</module>
         <module>shell-launcher</module>
         <module>full-launcher</module>

http://git-wip-us.apache.org/repos/asf/clerezza/blob/b7ec07bb/provisioning/launchers/shell-launcher/dependency-reduced-pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/shell-launcher/dependency-reduced-pom.xml b/provisioning/launchers/shell-launcher/dependency-reduced-pom.xml
deleted file mode 100644
index 47a0cd4..0000000
--- a/provisioning/launchers/shell-launcher/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,232 +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>shell-launcher</artifactId>
-  <name>Clerezza - Shell only Launcher</name>
-  <version>0.1-SNAPSHOT</version>
-  <description>Runnable jar using the clerezza partial bundlelists.</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>shell</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/b7ec07bb/provisioning/platform.content/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/platform.content/pom.xml b/provisioning/platform.content/pom.xml
new file mode 100644
index 0000000..0fb7ab5
--- /dev/null
+++ b/provisioning/platform.content/pom.xml
@@ -0,0 +1,80 @@
+<?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>platform.content</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>Clerezza - Provisioning - Platform Content</name>
+    <description>A Karaf feature and partialbundlelist with the bundles providing 
+        the clerezza content functionality.
+    
+        This feature depends on java and OSGi platform libraries (javax.xml,
+        org.osgi.service.cm and others), slf4j logging
+        - rdf
+        - rdf.web
+        - platform.graphnodprovider
+        - typerendering
+        - typehandlerspace   
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>platform.content</artifactId>
+            <version>0.14-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>platform.content.default404</artifactId>
+            <version>0.2-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.clerezza</groupId>
+            <artifactId>platform.content.fsadaptor</artifactId>
+            <version>0.2-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/b7ec07bb/provisioning/platform.content/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/provisioning/platform.content/src/main/feature/feature.xml b/provisioning/platform.content/src/main/feature/feature.xml
new file mode 100644
index 0000000..9b0f399
--- /dev/null
+++ b/provisioning/platform.content/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

http://git-wip-us.apache.org/repos/asf/clerezza/blob/b7ec07bb/provisioning/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/pom.xml b/provisioning/pom.xml
index 6d8ae82..2269730 100644
--- a/provisioning/pom.xml
+++ b/provisioning/pom.xml
@@ -51,6 +51,7 @@
         <module>typehandlerspace</module>
         <module>typerendering</module>
         <module>rdf.web</module>
+        <module>platform.content</module>
         <module>shell</module>
         <module>launchers</module>
     </modules>


Mime
View raw message