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 2014/03/05 23:32:40 UTC
svn commit: r1574699 - in /myfaces/orchestra/trunk/examples22: ./
src/main/java/org/apache/myfaces/examples/dynaForm/model/
src/main/java/org/apache/myfaces/examples/mops/model/
src/main/java/org/apache/myfaces/examples/simple/backings/ src/main/webapp...
Author: lu4242
Date: Wed Mar 5 22:32:39 2014
New Revision: 1574699
URL: http://svn.apache.org/r1574699
Log:
comment sandbox code and set dependencies to JSF 2.2
Modified:
myfaces/orchestra/trunk/examples22/pom.xml
myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/dynaForm/model/SimpleEntity.java
myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/Product.java
myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ProductPrice.java
myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ShopCustomer.java
myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/simple/backings/CompanyView.java
myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/applicationContext.xml
Modified: myfaces/orchestra/trunk/examples22/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/pom.xml?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/pom.xml (original)
+++ myfaces/orchestra/trunk/examples22/pom.xml Wed Mar 5 22:32:39 2014
@@ -37,9 +37,9 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
- <name>MyFaces Orchestra Examples Project</name>
+ <name>MyFaces Orchestra Examples 2.2 Project</name>
<groupId>org.apache.myfaces.orchestra</groupId>
- <artifactId>myfaces-orchestra-examples-project</artifactId>
+ <artifactId>myfaces-orchestra-examples22-project</artifactId>
<version>1.0-SNAPSHOT</version>
<description>
A webapp (warfile) which demonstrates the features of Orchestra, including basic
@@ -49,7 +49,7 @@
<parent>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-maven</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
<scm>
@@ -67,252 +67,68 @@
</pluginRepositories>
<profiles>
- <!-- By default, use the JSF 1.1 version of MyFaces -->
- <profile>
- <id>myfaces-default</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces11.version}</version>
- </dependency>
-
- <dependency>
- <!-- needed just to run jetty -->
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces11.version}</version>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk-sandbox</artifactId>
- <version>1.1.12-SNAPSHOT</version>
- </dependency>
--->
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <!-- Use the version used to compile Orchestra : -Djsf=c -->
- <profile>
- <id>myfaces-compiled</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>c</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- </dependency>
-
- <!-- needed just to run jetty -->
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <!-- To use the examples using the MyFaces JSF Implementation 1.2 : -Djsf=12 -->
- <profile>
- <id>myfaces-1.2</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces12.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- needed just to run jetty -->
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <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>
- <jsf_implementation>MyFaces 1.2</jsf_implementation>
- </properties>
- </profile>
<profile>
- <id>myfaces-2.0</id>
+ <id>myfaces-2.2</id>
<activation>
<property>
- <name>jsf</name>
- <value>20</value>
+ <name>!jsf</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces20.version}</version>
+ <version>${myfaces.version}</version>
<scope>compile</scope>
</dependency>
-
<!-- needed just to run jetty -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces20.version}</version>
+ <version>${myfaces.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>
- <jsf_implementation>MyFaces 2.0</jsf_implementation>
+ <jsf_implementation>MyFaces 2.2</jsf_implementation>
</properties>
</profile>
<!-- To use the examples using Sun Mojarra 1.2 (JSF RI): -Djsf=ri12 -->
<profile>
- <id>jsfri12</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${ri12.version}</version>
- </dependency>
-
- <!-- needed just to run jetty -->
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <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>
- <version>1.0-M1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <!-- sun stuff is only availiable from maven1 repositories, so add that -->
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <properties>
- <jsf_implementation>JSF-RI 1.2</jsf_implementation>
- </properties>
- </profile>
-
- <!-- To use the examples using Sun Mojarra 2.0 (JSF RI): -Djsf=ri20 -->
- <profile>
- <id>jsfri20</id>
+ <id>mojarra</id>
<activation>
<property>
<name>jsf</name>
- <value>ri20</value>
+ <value>mojarra</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${ri20.version}</version>
+ <version>${mojarra.version}</version>
</dependency>
<!-- needed just to run jetty -->
<dependency>
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>${ri20.version}</version>
+ <version>${mojarra.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>
- <version>1.0-M1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <!-- sun stuff is only availiable from maven1 repositories, so add that -->
- <repositories>
- <repository>
- <id>java.net.2</id>
- <name>java.net Maven 2 Repository</name>
- <url>http://download.java.net/maven/2</url>
- </repository>
- </repositories>
+ </dependencies>
<properties>
- <jsf_implementation>JSF-RI 2.0</jsf_implementation>
+ <jsf_implementation>Mojarra 2.2</jsf_implementation>
</properties>
</profile>
<profile>
- <id>orchestra-1.1</id>
+ <id>orchestra-2.2</id>
<activation>
<property>
<name>!orchestra</name>
@@ -320,45 +136,8 @@
</activation>
<dependencies>
<dependency>
- <!-- 1.3 or later needed for flow 0.0.1 -->
- <groupId>org.apache.myfaces.orchestra</groupId>
- <artifactId>myfaces-orchestra-core</artifactId>
- <version>${orchestra.core.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>orchestra-1.2</id>
- <activation>
- <property>
- <name>orchestra</name>
- <value>12</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <!-- 1.3 or later needed for flow 0.0.1 -->
<groupId>org.apache.myfaces.orchestra</groupId>
- <artifactId>myfaces-orchestra-core12</artifactId>
- <version>${orchestra.core.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>orchestra-2.0</id>
- <activation>
- <property>
- <name>orchestra</name>
- <value>20</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <!-- 1.3 or later needed for flow 0.0.1 -->
- <groupId>org.apache.myfaces.orchestra</groupId>
- <artifactId>myfaces-orchestra-core20</artifactId>
+ <artifactId>myfaces-orchestra-core22</artifactId>
<version>${orchestra.core.version}</version>
</dependency>
</dependencies>
@@ -553,6 +332,7 @@
</dependency>
-->
+ <!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-sandbox</artifactId>
@@ -564,11 +344,12 @@
</exclusion>
</exclusions>
</dependency>
+ -->
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.11</version>
+ <artifactId>tomahawk20</artifactId>
+ <version>1.1.14</version>
</dependency>
<dependency>
@@ -629,13 +410,6 @@
<version>1.2.13</version>
<scope>runtime</scope>
</dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.11</version>
- <scope>runtime</scope>
- </dependency>
<!-- Test Dependences -->
<dependency>
@@ -710,21 +484,6 @@
</execution>
</executions>
</plugin>
-
-<!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
</plugins>
</build>
@@ -735,43 +494,11 @@
<url>scpexe://people.apache.org/www/myfaces.apache.org/orchestra/myfaces-orchestra-examples-project</url>
</site>
</distributionManagement>
-
- <reporting>
- <plugins>
-<!--
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- </plugin>
--->
- </plugins>
-
- </reporting>
<properties>
- <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.12</myfaces20.version>
+ <orchestra.core.version>1.6-SNAPSHOT</orchestra.core.version>
+ <mojarra.version>2.2.5</mojarra.version>
+ <myfaces.version>2.2.1-SNAPSHOT</myfaces.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/examples22/src/main/java/org/apache/myfaces/examples/dynaForm/model/SimpleEntity.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/dynaForm/model/SimpleEntity.java?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/dynaForm/model/SimpleEntity.java (original)
+++ myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/dynaForm/model/SimpleEntity.java Wed Mar 5 22:32:39 2014
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.examples.dynaForm.model;
-import org.apache.myfaces.orchestra.dynaForm.annot.ui.ReadOnly;
+//import org.apache.myfaces.orchestra.dynaForm.annot.ui.ReadOnly;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -49,7 +49,7 @@ public class SimpleEntity
private Date startTime;
@Temporal(value = TemporalType.TIMESTAMP)
- @ReadOnly(disabled = true)
+ //@ReadOnly(disabled = true)
private Date lastChanged;
private Double value;
Modified: myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/Product.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/Product.java?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/Product.java (original)
+++ myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/Product.java Wed Mar 5 22:32:39 2014
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.examples.mops.model;
-import org.apache.myfaces.orchestra.dynaForm.annot.ui.DisplayOnly;
+//import org.apache.myfaces.orchestra.dynaForm.annot.ui.DisplayOnly;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
@@ -61,7 +61,7 @@ public class Product
@Id
@GeneratedValue(strategy= GenerationType.TABLE)
- @DisplayOnly
+ //@DisplayOnly
public Long getId()
{
return id;
@@ -116,7 +116,7 @@ public class Product
}
@Version
- @DisplayOnly
+ //@DisplayOnly
public Long getVersion()
{
return version;
Modified: myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ProductPrice.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ProductPrice.java?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ProductPrice.java (original)
+++ myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ProductPrice.java Wed Mar 5 22:32:39 2014
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.examples.mops.model;
-import org.apache.myfaces.orchestra.dynaForm.annot.ui.DataProvider;
-import org.apache.myfaces.orchestra.dynaForm.annot.ui.DisplayOnly;
+//import org.apache.myfaces.orchestra.dynaForm.annot.ui.DataProvider;
+//import org.apache.myfaces.orchestra.dynaForm.annot.ui.DisplayOnly;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
@@ -86,7 +86,7 @@ public class ProductPrice
}
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, optional = false)
- @DisplayOnly
+ //@DisplayOnly
public Product getProduct()
{
return product;
@@ -143,10 +143,10 @@ public class ProductPrice
}
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
- @DataProvider(
- description = "#{customerGroupSuggest.getDescription}",
- value = "#{customerGroupSuggest.getCustomerGroupsByFulltext}",
- converterBean="customerGroupPkConverter")
+ //@DataProvider(
+ // description = "#{customerGroupSuggest.getDescription}",
+ // value = "#{customerGroupSuggest.getCustomerGroupsByFulltext}",
+ // converterBean="customerGroupPkConverter")
public CustomerGroup getCustomerGroup()
{
return customerGroup;
Modified: myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ShopCustomer.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ShopCustomer.java?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ShopCustomer.java (original)
+++ myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/mops/model/ShopCustomer.java Wed Mar 5 22:32:39 2014
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.examples.mops.model;
-import org.apache.myfaces.orchestra.dynaForm.annot.ui.DataProvider;
+//import org.apache.myfaces.orchestra.dynaForm.annot.ui.DataProvider;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
@@ -91,10 +91,10 @@ public class ShopCustomer
}
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL, optional = false)
- @DataProvider(
- description = "#{customerGroupSuggest.getDescription}",
- value = "#{customerGroupSuggest.getCustomerGroupsByFulltext}",
- converterBean="customerGroupPkConverter")
+ //@DataProvider(
+ // description = "#{customerGroupSuggest.getDescription}",
+ // value = "#{customerGroupSuggest.getCustomerGroupsByFulltext}",
+ // converterBean="customerGroupPkConverter")
public CustomerGroup getCustomerGroup()
{
return customerGroup;
Modified: myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/simple/backings/CompanyView.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/simple/backings/CompanyView.java?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/simple/backings/CompanyView.java (original)
+++ myfaces/orchestra/trunk/examples22/src/main/java/org/apache/myfaces/examples/simple/backings/CompanyView.java Wed Mar 5 22:32:39 2014
@@ -23,14 +23,14 @@ import org.apache.commons.logging.LogFac
import org.apache.myfaces.examples.ballot.dto.AddressDto;
import org.apache.myfaces.examples.ballot.dto.CompanyDto;
import org.apache.myfaces.examples.ballot.dto.PersonDto;
-import org.apache.myfaces.orchestra.conversation.Conversation;
-import org.apache.myfaces.orchestra.conversation.versioning.SavePoint;
-import org.apache.myfaces.orchestra.conversation.versioning.VersioningConversation;
+//import org.apache.myfaces.orchestra.conversation.Conversation;
+//import org.apache.myfaces.orchestra.conversation.versioning.SavePoint;
+//import org.apache.myfaces.orchestra.conversation.versioning.VersioningConversation;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+//import java.util.HashMap;
+//import java.util.Map;
/**
* JSF backing-bean (aka controller class) for editCompany.jsp.
@@ -47,7 +47,7 @@ public class CompanyView implements Seri
private PersonDto actionTargetPerson;
private AddressDto actionTargetAddress;
- private Map<String,SavePoint> companyVersions = new HashMap<String,SavePoint>();
+ //private Map<String,SavePoint> companyVersions = new HashMap<String,SavePoint>();
public CompanyDto getCompany()
{
@@ -57,7 +57,7 @@ public class CompanyView implements Seri
}
return company;
}
-
+/*
public String savePerson()
{
getCurrentVersioningConversation().createSavePoint(getActualUniquePersonName());
@@ -106,7 +106,7 @@ public class CompanyView implements Seri
actionTargetAddress.setEditing(false);
return null;
}
-
+*/
private String getActualUniquePersonName()
{
return "person" + company.getPersons().indexOf(actionTargetPerson);
Modified: myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/applicationContext.xml?rev=1574699&r1=1574698&r2=1574699&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ myfaces/orchestra/trunk/examples22/src/main/webapp/WEB-INF/applicationContext.xml Wed Mar 5 22:32:39 2014
@@ -65,11 +65,13 @@
</property>
</bean>
</entry>
+ <!--
<entry key="conversation.versioning">
<bean class="org.apache.myfaces.orchestra.conversation.versioning.spring.SpringVersioningScope">
<property name="versioningStrategy" value="serialization"/>
</bean>
</entry>
+ -->
</map>
</property>
</bean>