You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/01/04 08:52:56 UTC

svn commit: r895573 - /myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java

Author: matzew
Date: Mon Jan  4 07:52:49 2010
New Revision: 895573

URL: http://svn.apache.org/viewvc?rev=895573&view=rev
Log:
TRINIDAD-1661 - get rid of oracle.application.environment system property

replaced with ProjectStage API from JSF2.0

Modified:
    myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java

Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java?rev=895573&r1=895572&r2=895573&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/ViewHandlerImpl.java Mon Jan  4 07:52:49 2010
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.trinidadinternal.application;
 
-import java.io.File;
 import java.io.InputStream;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -29,7 +28,6 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 
@@ -412,11 +410,7 @@
         checkTimestampParam = !(context.isProjectStage(ProjectStage.Production));
       }
 
-      // Detect when we're running inside of the JDeveloper embedded OC4J
-      // environment - and there, always use timestamp checking
-      // TODO: come up with a non-proprietary way of checking this? (see TRINIDAD-1661)
-      boolean developmentStage = context.isProjectStage(ProjectStage.Development) ||
-        "development".equals(System.getProperty("oracle.application.environment"));
+      boolean developmentStage = context.isProjectStage(ProjectStage.Development);
       
       // if Apache MyFaces Trinidad is running in production stage CHECK_TIMESTAMP_PARAM should
       // be FALSE, otherwise we generate a WARNING message