You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/03/20 23:57:32 UTC
svn commit: r1303190 - in /myfaces/orchestra/trunk: ./ examples/
examples/src/main/webapp/WEB-INF/ maven/ maven/src/site/
maven/src/site/xdoc/ sandbox/
sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/
Author: lu4242
Date: Tue Mar 20 22:57:31 2012
New Revision: 1303190
URL: http://svn.apache.org/viewvc?rev=1303190&view=rev
Log:
fix pom.xml files to exclude examples and sandbox modules from build process by default, and use a more up to date master pom
Added:
myfaces/orchestra/trunk/maven/src/site/xdoc/ViewControllerAnnotations.xml (with props)
Modified:
myfaces/orchestra/trunk/examples/pom.xml
myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml
myfaces/orchestra/trunk/maven/pom.xml
myfaces/orchestra/trunk/maven/src/site/site.xml
myfaces/orchestra/trunk/pom.xml
myfaces/orchestra/trunk/sandbox/pom.xml
myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java
Modified: myfaces/orchestra/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/pom.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/pom.xml (original)
+++ myfaces/orchestra/trunk/examples/pom.xml Tue Mar 20 22:57:31 2012
@@ -89,12 +89,13 @@
<artifactId>myfaces-impl</artifactId>
<version>${myfaces11.version}</version>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-sandbox</artifactId>
- <version>1.1.9-SNAPSHOT</version>
+ <version>1.1.12-SNAPSHOT</version>
</dependency>
+-->
<dependency>
<groupId>javax.el</groupId>
@@ -153,13 +154,13 @@
<version>${myfaces12.version}</version>
<scope>runtime</scope>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-flow</artifactId>
<version>${orchestra.flow.version}</version>
</dependency>
-
+-->
</dependencies>
<properties>
@@ -190,12 +191,13 @@
<version>${myfaces20.version}</version>
<scope>runtime</scope>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-flow</artifactId>
<version>${orchestra.flow.version}</version>
</dependency>
+-->
</dependencies>
<properties>
@@ -227,13 +229,13 @@
<version>${ri12.version}</version>
<scope>runtime</scope>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-flow</artifactId>
<version>${orchestra.flow.version}</version>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
@@ -280,13 +282,13 @@
<version>${ri20.version}</version>
<scope>runtime</scope>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-flow</artifactId>
<version>${orchestra.flow.version}</version>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
@@ -566,7 +568,7 @@
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>1.1.9-SNAPSHOT</version>
+ <version>1.1.11</version>
</dependency>
<dependency>
@@ -761,13 +763,15 @@
</reporting>
<properties>
- <orchestra.core.version>1.4-SNAPSHOT</orchestra.core.version>
+ <orchestra.core.version>1.5-SNAPSHOT</orchestra.core.version>
+<!--
<orchestra.flow.version>0.0.1-SNAPSHOT</orchestra.flow.version>
+-->
<ri12.version>1.2_09</ri12.version>
<ri20.version>2.0.2-b10</ri20.version>
<myfaces11.version>1.1.6</myfaces11.version>
<myfaces12.version>1.2.8</myfaces12.version>
- <myfaces20.version>2.0.0-SNAPSHOT</myfaces20.version>
+ <myfaces20.version>2.0.12</myfaces20.version>
<maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
<cargo.version>1.0</cargo.version>
<htmlunit.version>2.5</htmlunit.version>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/faces-config.xml Tue Mar 20 22:57:31 2012
@@ -22,7 +22,9 @@
<application>
<variable-resolver>org.springframework.web.jsf.DelegatingVariableResolver</variable-resolver>
+<!--
<navigation-handler>org.apache.myfaces.custom.redirectTracker.RedirectTrackerNavigationHandler</navigation-handler>
+-->
<locale-config>
<default-locale>en</default-locale>
<supported-locale>en</supported-locale>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml Tue Mar 20 22:57:31 2012
@@ -106,10 +106,12 @@
- This examples app only needs to preserve messages, not request-scoped-data, across
- redirects so just that functionality of the RedirectTrackerManager is enabled here.
-->
+<!--
<context-param>
<param-name>org.apache.myfaces.redirectTracker.POLICY</param-name>
<param-value>org.apache.myfaces.custom.redirectTracker.policy.MessagesRedirectTrackPolicy</param-value>
</context-param>
+-->
<!--
- This example app uses some Myfaces Tomahawk components, and some of these load resources
Modified: myfaces/orchestra/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/maven/pom.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/maven/pom.xml (original)
+++ myfaces/orchestra/trunk/maven/pom.xml Tue Mar 20 22:57:31 2012
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>9</version>
+ <version>13</version>
</parent>
<groupId>org.apache.myfaces.orchestra</groupId>
@@ -144,9 +144,7 @@
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.3</version>
<executions>
<execution>
<id>attach-source</id>
@@ -196,7 +194,6 @@
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<id>verify-style</id>
@@ -210,43 +207,19 @@
</configuration>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- <configuration>
- activate for the release - is this somehow automatically possible?
- manolito: yes it is, just do it with release plugin or use -DperformRelease=true
- <skip>true</skip>
- <useAgent>true</useAgent>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
</plugins>
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
+ <version>2.8</version>
<configuration>
<encoding>${myfaces.encoding.source}</encoding>
<docEncoding>${myfaces.encoding.doc}</docEncoding>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -257,20 +230,6 @@
</pluginManagement>
</build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <configLocation>default/myfaces-checks-standard.xml</configLocation>
- <headerLocation>default/myfaces-header.txt</headerLocation>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<properties>
<!-- ensure to not to point to a snapshot version during release -->
<myfaces.version>1.1.5</myfaces.version>
Modified: myfaces/orchestra/trunk/maven/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/maven/src/site/site.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/maven/src/site/site.xml (original)
+++ myfaces/orchestra/trunk/maven/src/site/site.xml Tue Mar 20 22:57:31 2012
@@ -88,7 +88,7 @@
<item name="Examples" href="http://myfaces.apache.org/orchestra/myfaces-orchestra-examples-project/index.html"/>
</menu>
- <menu ref="reports"/>
+ <menu ref="reports" inherit="top"/>
<menu name="Foundation" inherit="bottom">
<item name="ASF" href="http://www.apache.org/" />
Added: myfaces/orchestra/trunk/maven/src/site/xdoc/ViewControllerAnnotations.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/maven/src/site/xdoc/ViewControllerAnnotations.xml?rev=1303190&view=auto
==============================================================================
--- myfaces/orchestra/trunk/maven/src/site/xdoc/ViewControllerAnnotations.xml (added)
+++ myfaces/orchestra/trunk/maven/src/site/xdoc/ViewControllerAnnotations.xml Tue Mar 20 22:57:31 2012
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE document PUBLIC "-//Apache Software Foundation//DTD XDOC 1.0//EN"
+ "http://www.apache.org/dtd/xdoc.dtd">
+<!--
+ 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.
+ -->
+<document>
+ <properties>
+ <title>ViewController Annotations</title>
+ </properties>
+
+ <body>
+ <section name="Introduction">
+ <p>
+ The Orchestra core framework supports the concept of a "View Controller" bean
+ which receives lifecycle events for one or more views. There are two separate
+ types of configuration that are needed for view controllers:
+ </p>
+ <ul>
+ <li>configuring which bean is the view controller for which views</li>
+ <li>configuring which methods on the bean should be called</li>
+ </ul>
+ <p>
+ The core module provides several ways of specifying these configuration options;
+ this core15 provides one additional mechanism: Java annotations.
+ </p>
+ <p>
+ The annotations available are described in the "view controller" documentation
+ within the orchestra core module (even though this core15 module is required
+ in order to use them). Please see that documentation for further information.
+ </p>
+ </section>
+ </body>
+</document>
Propchange: myfaces/orchestra/trunk/maven/src/site/xdoc/ViewControllerAnnotations.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: myfaces/orchestra/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/pom.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/pom.xml (original)
+++ myfaces/orchestra/trunk/pom.xml Tue Mar 20 22:57:31 2012
@@ -39,7 +39,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>6</version>
+ <version>13</version>
</parent>
<groupId>org.apache.myfaces.orchestra</groupId>
@@ -64,12 +64,29 @@
<module>core</module>
<module>core12</module>
<module>core20</module>
- <!-- module>core15</module -->
- <module>flow</module>
- <module>sandbox</module>
- <module>examples</module>
</modules>
+ <profiles>
+ <profile>
+ <id>compile-all</id>
+ <modules>
+ <module>flow</module>
+ <module>sandbox</module>
+ <module>examples</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <arguments>-DprepareRelease</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<distributionManagement>
<site>
<id>apache-site</id>
Modified: myfaces/orchestra/trunk/sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/pom.xml?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/pom.xml (original)
+++ myfaces/orchestra/trunk/sandbox/pom.xml Tue Mar 20 22:57:31 2012
@@ -100,7 +100,7 @@
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
- <version>1.1.7</version>
+ <version>1.1.12-SNAPSHOT</version>
</dependency>
<!--
@@ -115,7 +115,13 @@
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-sandbox</artifactId>
- <version>1.1.10-SNAPSHOT</version>
+ <version>1.1.12-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-converters11</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java?rev=1303190&r1=1303189&r2=1303190&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesGuiBuilder.java Tue Mar 20 22:57:31 2012
@@ -21,7 +21,7 @@ package org.apache.myfaces.orchestra.dyn
import org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.jsf.JsfGuiBuilder;
import org.apache.myfaces.orchestra.dynaForm.metadata.MetaField;
import org.apache.myfaces.orchestra.dynaForm.lib.ObjectSerializationConverter;
-import org.apache.myfaces.custom.convertNumber.TypedNumberConverter;
+import org.apache.myfaces.commons.converter.TypedNumberConverter;
import org.apache.myfaces.custom.calendar.HtmlInputCalendar;
import org.apache.myfaces.custom.suggestajax.inputsuggestajax.InputSuggestAjax;