You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/10/04 07:31:28 UTC
[myfaces-tobago] branch master updated (8bba4ff -> a402733)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from 8bba4ff TOBAGO-1789 New (Bootstrap beta) offset concept for tc:segmentLayout * implement margin concept for segmentLayout / segmentLayoutConstraints
new fd53f44 demo: text
new 37da36a demo
new 24ea44e TOBAGO-1795: Set Java Source to Java 8
new a402733 Merge remote-tracking branch 'origin/master'
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/myfaces/tobago/example/demo/Demo.xml | 13 ++++++-------
.../new+in+4+0.xhtml} | 19 ++++++++++++++-----
.../src/main/webapp/content/10-intro/intro.xhtml | 8 ++++----
.../tobago-example-demo/src/main/webapp/menu.xhtml | 11 ++++++-----
.../tobago/apt/processor/AbstractGenerator.java | 2 +-
5 files changed, 31 insertions(+), 22 deletions(-)
copy tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/{50-migration/migration.xhtml => 28-new+in+4+0/new+in+4+0.xhtml} (58%)
--
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].
[myfaces-tobago] 03/04: TOBAGO-1795: Set Java Source to Java 8
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 24ea44e43c2a177cfc90df8c5caae1f15831b748
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Sep 28 17:05:49 2017 +0200
TOBAGO-1795: Set Java Source to Java 8
---
.../java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
index 9cb5f92..18a234e 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
@@ -35,7 +35,7 @@ import java.util.Comparator;
import java.util.List;
import java.util.Set;
-@SupportedSourceVersion(SourceVersion.RELEASE_6)
+@SupportedSourceVersion(SourceVersion.RELEASE_8)
public abstract class AbstractGenerator extends AbstractProcessor {
private List<TypeElement> types;
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 04/04: Merge remote-tracking branch 'origin/master'
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit a402733ae12fc10fea51a6a847513fcf3140f221
Merge: 24ea44e 8bba4ff
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Sep 29 15:25:45 2017 +0200
Merge remote-tracking branch 'origin/master'
.../myfaces/tobago/component/Attributes.java | 38 +-
.../facelets/SegmentLayoutConstraintHandler.java | 115 ++---
.../myfaces/tobago/facelets/SegmentLayoutRule.java | 130 ------
.../tobago/facelets/TobagoComponentHandler.java | 4 -
.../component/AbstractUISegmentLayout.java | 18 +-
.../renderkit/renderer/SegmentLayoutRenderer.java | 17 +-
.../SegmentLayoutConstraintTagDeclaration.java | 80 ++--
.../component/SegmentLayoutTagDeclaration.java | 68 ++-
.../myfaces/tobago/layout/ColumnPartition.java | 131 ------
.../apache/myfaces/tobago/layout/LayoutTokens.java | 6 +
.../org/apache/myfaces/tobago/layout/Margin.java | 32 ++
.../apache/myfaces/tobago/layout/MarginTokens.java | 74 ++++
.../myfaces/tobago/layout/SegmentLayoutToken.java | 64 +++
.../tobago/renderkit/css/BootstrapClass.java | 461 +++++++--------------
.../tobago/layout/ColumnPartitionUnitTest.java | 59 ---
.../tobago/layout/LayoutTokensUnitTest.java | 8 +
.../50-migration/96-migration/migration40.xhtml | 69 +--
.../16-layout/30-segment/segment-layout.xhtml | 143 +++----
.../tobago-example-demo/src/main/webapp/main.xhtml | 2 +-
.../tobago/apt/processor/TaglibGenerator.java | 3 -
.../org/apache/myfaces/tobago/apt/component.stg | 4 -
21 files changed, 636 insertions(+), 890 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 02/04: demo
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 37da36a282c3d08ee53f7f795765e2eb537796eb
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Sep 28 16:10:39 2017 +0200
demo
---
.../apache/myfaces/tobago/example/demo/Demo.xml | 13 ++++---
.../10-intro/28-new+in+4+0/new+in+4+0.xhtml | 41 ++++++++++++++++++++++
.../tobago-example-demo/src/main/webapp/menu.xhtml | 11 +++---
3 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml b/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
index 96ff088..cc19c9b 100644
--- a/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
+++ b/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
@@ -30,8 +30,6 @@
<entry key="menu_config">Configuration</entry>
<entry key="menu_themes">Theme</entry>
<entry key="menu_locale">Language</entry>
- <entry key="menu_help">Help</entry>
- <entry key="menu_about">About</entry>
<entry key="menu_test">Test</entry>
<entry key="menu_runTest">Run Test</entry>
<entry key="menu_closeTest">Close Test</entry>
@@ -40,13 +38,14 @@
<!-- navigate -->
<entry key="intro">Intro</entry>
- <entry key="new_in_3_0">New in Tobago 3.0</entry>
- <entry key="new_in_2_0">New in Tobago 2.0</entry>
+ <entry key="new_in_4_0">Tobago 4</entry>
+ <entry key="new_in_3_0">Tobago 3</entry>
+ <entry key="new_in_2_0">Tobago 2</entry>
<entry key="migration">Migration</entry>
<entry key="migration15">to 1.5</entry>
- <entry key="migration20">to 2.0</entry>
- <entry key="migration30">to 3.0</entry>
- <entry key="migration40">to 4.0</entry>
+ <entry key="migration20">to 2</entry>
+ <entry key="migration30">to 3</entry>
+ <entry key="migration40">to 4</entry>
<!-- navigate : components -->
<entry key="component">Components</entry>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml
new file mode 100644
index 0000000..a904523
--- /dev/null
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml
@@ -0,0 +1,41 @@
+<?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.
+-->
+
+<ui:composition template="/main.xhtml"
+ xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:param name="title" value="#{demoBundle.new_in_4_0}"/>
+ <p>In fall 2017 the release of Tobago 4.0.0 is scheduled.
+ Here is a quick overview over the features and changes made in the last time to release this major revision.</p>
+ <p>Tobago 4.0.0 contains several entries in
+ <tc:link label="Jira"
+ link="https://issues.apache.org/jira/projects/TOBAGO/versions/12338728"/>.</p>
+ <p>Please take also a look at the <tc:link label="Migration from Tobago 3 to 4"
+ outcome="/content/10-intro/50-migration/96-migration/migration40.xhtml"/> guide.</p>
+
+ <tc:section label="Overview and History">
+ <p>TODO</p>
+ </tc:section>
+
+ <tc:section label="New Features and Enhancements">
+ <b>TODO</b>
+ <p>TODO</p>
+ </tc:section>
+</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
index d9f36b9..d39de73 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
@@ -93,18 +93,19 @@
</tc:link>
</tc:link>
- <tc:link label="#{demoBundle.menu_help}" omit="true">
- <tc:link label="#{demoBundle.menu_about}" omit="true">
+ <tc:link label="Info" omit="true">
+ <tc:link label="About" omit="true">
<tc:dataAttribute name="alert-text"
value="#{demoBundle.pageTitle} - #{info.version} - #{demoBundle.tobago_url}"/>
</tc:link>
<tc:link omit="true" label="Client Info" id="headerInfo">
<tc:operation name="show" for=":::info"/>
</tc:link>
- <tc:link action="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
- <tc:link action="/logging-info.xhtml" immediate="true" label="Logging Info"
+ <tc:link outcome="/server-info.xhtml" immediate="true" label="Server Info" disabled="#{! info.enabled}"/>
+ <tc:link outcome="/logging-info.xhtml" immediate="true" label="Logging Info"
disabled="#{! info.enabled}"/>
- <tc:link link="http://myfaces.apache.org/tobago" label="Tobago in the Web"/>
+ <tc:separator/>
+ <tc:link link="http://myfaces.apache.org/tobago" label="Tobago Home"/>
</tc:link>
</tc:links>
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.
[myfaces-tobago] 01/04: demo: text
Posted by lo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit fd53f44a3907569ad4c28f46d3d671846ff01991
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Sep 28 15:46:28 2017 +0200
demo: text
---
.../src/main/webapp/content/10-intro/intro.xhtml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
index 32fe5fe..aec7037 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
@@ -22,10 +22,10 @@
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="#{demoBundle.intro}"/>
- <p>This is the demo of Tobago 3.
- It shows the components and concepts of Tobago 3 and also should be a bit of a documentation.</p>
- <p>If you want to migrate from Tobago 2.0 to 3.0, you'll find further information in the
- <tc:link label="migration guide" outcome="/content/10-intro/50-migration/97-migration/migration30.xhtml"/>.</p>
+ <p>This is the demo of Tobago.
+ It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
+ <p>If you want to migrate from an older version, you'll find further information in the
+ <tc:link label="migration guide" outcome="/content/10-intro/50-migration/migration.xhtml"/>.</p>
<p>If you want to start this demo on you local machine, have a look at the section 'Local Demo'.</p>
<tc:section label="Description">
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.