You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/09/30 08:06:27 UTC

[isis] branch v2 updated: ISIS-2158: add new extension module 'incubator' just stubs (pom, adoc)

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/v2 by this push:
     new e6cc9b4  ISIS-2158: add new extension module 'incubator' just stubs (pom,adoc)
e6cc9b4 is described below

commit e6cc9b49b6b7b7bfe082f3f9348ff09ed06dce26
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 30 10:06:17 2019 +0200

    ISIS-2158: add new extension module 'incubator' just stubs (pom,adoc)
    
    - this module shall allow for more experimental features that could
    eventually make it to core, provided there is enough 'popularity'
    - we are about to move the @Model and the Server-Side Event support
    there
---
 antora/components/toc/modules/ROOT/nav.adoc        |  3 +
 .../components/toc/modules/ROOT/pages/about.adoc   |  1 +
 .../toc/modules/ROOT/pages/components.adoc         |  1 +
 extensions/incubator/_adoc/antora.yml              |  6 ++
 extensions/incubator/_adoc/examples.csv            |  1 +
 .../incubator/_adoc/modules/ROOT/_attributes.adoc  |  6 ++
 .../_adoc/modules/ROOT/assets/attachments/.gitkeep |  0
 .../_adoc/modules/ROOT/assets/images/.gitkeep      |  0
 .../incubator/_adoc/modules/ROOT/examples/.gitkeep |  0
 extensions/incubator/_adoc/modules/ROOT/nav.adoc   |  2 +
 .../_adoc/modules/ROOT/pages/_attributes.adoc      |  4 +
 .../modules/ROOT/pages/_partials/_attributes.adoc  |  4 +
 .../incubator/_adoc/modules/ROOT/pages/about.adoc  |  6 ++
 extensions/incubator/_adoc/sync_examples.sh        | 39 +++++++++
 extensions/incubator/pom.xml                       | 93 ++++++++++++++++++++++
 15 files changed, 166 insertions(+)

diff --git a/antora/components/toc/modules/ROOT/nav.adoc b/antora/components/toc/modules/ROOT/nav.adoc
index 2dce8ea..da08eae 100644
--- a/antora/components/toc/modules/ROOT/nav.adoc
+++ b/antora/components/toc/modules/ROOT/nav.adoc
@@ -43,6 +43,9 @@
 ** link:https://github/TODO/TODO[Seb's viewer (3rd party)]
 ** link:https://github/TODO/TODO[Joerg's viewer (3rd party)]
 
+* Incubator
+
+** xref:ext-incubator:ROOT:about.adoc[Experimental framework extensions]
 
 * DataNucleus Object Store
 
diff --git a/antora/components/toc/modules/ROOT/pages/about.adoc b/antora/components/toc/modules/ROOT/pages/about.adoc
index c46936d..2f32389 100644
--- a/antora/components/toc/modules/ROOT/pages/about.adoc
+++ b/antora/components/toc/modules/ROOT/pages/about.adoc
@@ -55,6 +55,7 @@ _Extensions:_
 * xref:ext-viewer-wicket-excel:ROOT:about.adoc[Excel Download]
 * xref:ext-asciidoc:ROOT:about.adoc[Asciidoc value type ]
 * xref:ext-markdown:ROOT:about.adoc[Markdown value type]
+* xref:ext-incubator:ROOT:about.adoc[Experimental framework extensions]
 
 | *xref:toc:ROOT:components.adoc#restful-objects-viewer[Restful Objects Viewer]*
 
diff --git a/antora/components/toc/modules/ROOT/pages/components.adoc b/antora/components/toc/modules/ROOT/pages/components.adoc
index ef9b7b5..73fa1b3 100644
--- a/antora/components/toc/modules/ROOT/pages/components.adoc
+++ b/antora/components/toc/modules/ROOT/pages/components.adoc
@@ -15,6 +15,7 @@ _Extensions:_
 * xref:ext-viewer-wicket-excel:ROOT:about.adoc[Excel Download]
 * xref:ext-asciidoc:ROOT:about.adoc[Asciidoc value type ]
 * xref:ext-markdown:ROOT:about.adoc[Markdown value type]
+* xref:ext-incubator:ROOT:about.adoc[Experimental framework extensions]
 
 == Restful Objects Viewer
 
diff --git a/extensions/incubator/_adoc/antora.yml b/extensions/incubator/_adoc/antora.yml
new file mode 100644
index 0000000..4483ca4
--- /dev/null
+++ b/extensions/incubator/_adoc/antora.yml
@@ -0,0 +1,6 @@
+name: ext-incubator
+title: "Extensions - Incubator"
+version: master
+start_page: ROOT:about.adoc
+nav:
+- modules/ROOT/nav.adoc
diff --git a/extensions/incubator/_adoc/examples.csv b/extensions/incubator/_adoc/examples.csv
new file mode 100644
index 0000000..5d5804b
--- /dev/null
+++ b/extensions/incubator/_adoc/examples.csv
@@ -0,0 +1 @@
+#file,source,target
diff --git a/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
new file mode 100644
index 0000000..787e5c4
--- /dev/null
+++ b/extensions/incubator/_adoc/modules/ROOT/_attributes.adoc
@@ -0,0 +1,6 @@
+ifndef::env-site,env-github[]
+:attachmentsdir: {moduledir}/assets/attachments
+:examplesdir: {moduledir}/examples
+:imagesdir: {moduledir}/assets/images
+:partialsdir: {moduledir}/pages/_partials
+endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/assets/attachments/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/assets/attachments/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/incubator/_adoc/modules/ROOT/assets/images/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/assets/images/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/incubator/_adoc/modules/ROOT/examples/.gitkeep b/extensions/incubator/_adoc/modules/ROOT/examples/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/extensions/incubator/_adoc/modules/ROOT/nav.adoc b/extensions/incubator/_adoc/modules/ROOT/nav.adoc
new file mode 100644
index 0000000..2815342
--- /dev/null
+++ b/extensions/incubator/_adoc/modules/ROOT/nav.adoc
@@ -0,0 +1,2 @@
+* xref:about.adoc[About]
+
diff --git a/extensions/incubator/_adoc/modules/ROOT/pages/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/pages/_attributes.adoc
new file mode 100644
index 0000000..e8ada7c
--- /dev/null
+++ b/extensions/incubator/_adoc/modules/ROOT/pages/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc b/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
new file mode 100644
index 0000000..d011536
--- /dev/null
+++ b/extensions/incubator/_adoc/modules/ROOT/pages/_partials/_attributes.adoc
@@ -0,0 +1,4 @@
+ifndef::env-site,env-github[]
+:moduledir: ../..
+include::{moduledir}/_attributes.adoc[]
+endif::[]
diff --git a/extensions/incubator/_adoc/modules/ROOT/pages/about.adoc b/extensions/incubator/_adoc/modules/ROOT/pages/about.adoc
new file mode 100644
index 0000000..a69145c
--- /dev/null
+++ b/extensions/incubator/_adoc/modules/ROOT/pages/about.adoc
@@ -0,0 +1,6 @@
+= Asciidoc Extension
+:Notice: 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 ag [...]
+include::_attributes.adoc[]
+
+TODO: v2: placeholder for documentation about extensions/incubator
+
diff --git a/extensions/incubator/_adoc/sync_examples.sh b/extensions/incubator/_adoc/sync_examples.sh
new file mode 100644
index 0000000..5260cd7
--- /dev/null
+++ b/extensions/incubator/_adoc/sync_examples.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+SCRIPT=$(readlink -f "$0")
+SCRIPTPATH=$(dirname "$SCRIPT")
+if [ $# -ne 1 ]; then
+    FILELIST=$SCRIPTPATH/examples.csv
+else
+    FILELIST=$1
+fi
+FILELISTFQN=$(readlink -f $FILELIST)
+DIRNAME=$(dirname $FILELISTFQN)
+BASENAME=$(basename $FILELISTFQN)
+
+cd $DIRNAME >/dev/null 2>&1
+cat $BASENAME | tail +2 | grep -v ^# | while read LINE
+do
+    FILE=$(echo $LINE | awk -F, '{print $1}' | awk '{$1=$1;print}')
+    F2=$(echo $LINE | awk -F, '{print $2}' | awk '{$1=$1;print}')
+    F3=$(echo $LINE | awk -F, '{print $3}' | awk '{$1=$1;print}')
+    SOURCEFQN=$DIRNAME/$F2/$FILE
+    TARGETDIR=$DIRNAME/$F3
+    TARGETFQN=$DIRNAME/$F3/$FILE
+
+    echo "SOURCEFQN: $SOURCEFQN"
+
+    if [ -f "$SOURCEFQN" ]
+    then
+
+        if [ -f "$TARGETFQN" ]
+        then
+            rm $TARGETFQN
+        fi
+        mkdir -p $TARGETDIR
+        cp $SOURCEFQN $TARGETFQN
+    else
+        echo "- does not exist ($SOURCEFQN) " >&2
+        exit 1
+    fi
+done
+cd - >/dev/null 2>&1
\ No newline at end of file
diff --git a/extensions/incubator/pom.xml b/extensions/incubator/pom.xml
new file mode 100644
index 0000000..03d3af4
--- /dev/null
+++ b/extensions/incubator/pom.xml
@@ -0,0 +1,93 @@
+<?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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.apache.isis.extensions</groupId>
+		<artifactId>isis-extensions</artifactId>
+		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<artifactId>isis-extensions-incubator</artifactId>
+	<name>Apache Isis Extensions - Incubator</name>
+	<description></description>
+
+	<properties>
+		<jar-plugin.automaticModuleName>org.apache.isis.extensions.incubator</jar-plugin.automaticModuleName>
+		<git-plugin.propertiesDir>org/apache/isis/extensions/incubator</git-plugin.propertiesDir>
+	</properties>
+
+	<dependencies>
+	
+		<dependency>
+			<groupId>org.apache.isis.core</groupId>
+			<artifactId>isis-metamodel</artifactId>
+		</dependency>
+		
+		<dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>isis-viewer-wicket-ui</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>flatten</id>
+			<activation>
+				<property>
+					<name>!skip.flatten</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>flatten-maven-plugin</artifactId>
+						<version>1.0.0</version>
+						<executions>
+							<execution>
+								<id>flatten</id>
+								<phase>process-resources</phase>
+								<goals>
+									<goal>flatten</goal>
+								</goals>
+								<configuration>
+									<flattenMode>defaults</flattenMode>
+									<updatePomFile>true</updatePomFile>
+									<pomElements>
+										<name>resolve</name>
+										<description>resolve</description>
+										<dependencies>resolve</dependencies>
+									</pomElements>
+								</configuration>
+							</execution>
+							<execution>
+								<id>flatten.clean</id>
+								<phase>clean</phase>
+								<goals>
+									<goal>clean</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+</project>