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 2014/01/05 22:50:08 UTC
git commit: CLEREZZA-815: created minimum launcher for TypeRendering,
fixed GlobalMenuRenderlet to work when no menu is available,
added typerendering.gui to typerendering feature
Updated Branches:
refs/heads/master ec88e357a -> b0da87831
CLEREZZA-815: created minimum launcher for TypeRendering, fixed GlobalMenuRenderlet to work when no menu is available, added typerendering.gui to typerendering feature
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/b0da8783
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/b0da8783
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/b0da8783
Branch: refs/heads/master
Commit: b0da87831db1dfc91f1a9c36f8d6e956be20fd95
Parents: ec88e35
Author: retobg <re...@apache.org>
Authored: Sun Jan 5 22:49:53 2014 +0100
Committer: retobg <re...@apache.org>
Committed: Sun Jan 5 22:49:53 2014 +0100
----------------------------------------------------------------------
platform.style.default/nbactions.xml | 11 +
.../src/main/scala/GlobalMenuRenderlet.scala | 5 +-
.../typerendering-launcher/nbactions.xml | 50 ++++
.../launchers/typerendering-launcher/pom.xml | 259 +++++++++++++++++++
.../src/main/bundles/list.xml | 5 +
.../src/main/config/note.txt | 1 +
provisioning/typerendering/pom.xml | 25 ++
7 files changed, 355 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b0da8783/platform.style.default/nbactions.xml
----------------------------------------------------------------------
diff --git a/platform.style.default/nbactions.xml b/platform.style.default/nbactions.xml
new file mode 100644
index 0000000..49e8307
--- /dev/null
+++ b/platform.style.default/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>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b0da8783/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
----------------------------------------------------------------------
diff --git a/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala b/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
index 9db29a0..faf8b32 100644
--- a/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
+++ b/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
@@ -59,7 +59,9 @@ def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
<ul>
- {for (menuItem <- res/menu("globalMenu")!!) yield
+ { println("res/menu(\"globalMenu\").lenght: "+(res/menu("globalMenu")).length)
+ ifx ((res/menu("globalMenu")).length > 0) {
+ for (menuItem <- res/menu("globalMenu")!!) yield
<li class="top-nav-entry"><div class="title">
{
if ((menuItem/menu("path")).length > 0) {
@@ -84,6 +86,7 @@ def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
}
</li>
}
+ }
</ul>
</div>
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b0da8783/provisioning/launchers/typerendering-launcher/nbactions.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/typerendering-launcher/nbactions.xml b/provisioning/launchers/typerendering-launcher/nbactions.xml
new file mode 100644
index 0000000..bfac297
--- /dev/null
+++ b/provisioning/launchers/typerendering-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/b0da8783/provisioning/launchers/typerendering-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/typerendering-launcher/pom.xml b/provisioning/launchers/typerendering-launcher/pom.xml
new file mode 100644
index 0000000..1045abb
--- /dev/null
+++ b/provisioning/launchers/typerendering-launcher/pom.xml
@@ -0,0 +1,259 @@
+<?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>typerendering-launcher</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Clerezza - Launcher: TypeRendering</name>
+ <description>Runnable jar using the clerezza partial bundlelists needed for
+ typerendering.</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>typerendering</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ </dependency>
+ </dependencies>
+
+
+</project>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b0da8783/provisioning/launchers/typerendering-launcher/src/main/bundles/list.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/typerendering-launcher/src/main/bundles/list.xml b/provisioning/launchers/typerendering-launcher/src/main/bundles/list.xml
new file mode 100644
index 0000000..1c97931
--- /dev/null
+++ b/provisioning/launchers/typerendering-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/b0da8783/provisioning/launchers/typerendering-launcher/src/main/config/note.txt
----------------------------------------------------------------------
diff --git a/provisioning/launchers/typerendering-launcher/src/main/config/note.txt b/provisioning/launchers/typerendering-launcher/src/main/config/note.txt
new file mode 100644
index 0000000..eb01c8c
--- /dev/null
+++ b/provisioning/launchers/typerendering-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/b0da8783/provisioning/typerendering/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/typerendering/pom.xml b/provisioning/typerendering/pom.xml
index 09680c7..21f9f72 100644
--- a/provisioning/typerendering/pom.xml
+++ b/provisioning/typerendering/pom.xml
@@ -100,6 +100,31 @@
<version>0.2-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.typerendering.gui</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.globalmenu.api</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.style.default</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
+
+ <!-- needed by default style -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>osgi.services</artifactId>
+ <version>0.2-SNAPSHOT</version>
+ </dependency>
+
<!-- needed by scalaservepages and typesrendering.scala -->
<dependency>
<groupId>org.apache.clerezza</groupId>