Author: jkoster Date: 2009-10-16 13:52:09 +0200 (Fri, 16 Oct 2009) New Revision: 39177
Modified: CMSContainer/branches/b1_6/CMSContainer_Demo/demo.cmscontainer.org/war-single/src/webapp/META-INF/context.xml CMSContainer/branches/b1_6/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/META-INF/context.xml CMSContainer/branches/b1_6/CMSContainer_Templates/single/war/src/webapp/META-INF/context.xml Log: CMSC-1319 - Single wars should note 'single' instead of staging. Modified: CMSContainer/branches/b1_6/CMSContainer_Demo/demo.cmscontainer.org/war-single/src/webapp/META-INF/context.xml =================================================================== --- CMSContainer/branches/b1_6/CMSContainer_Demo/demo.cmscontainer.org/war-single/src/webapp/META-INF/context.xml 2009-10-16 11:52:04 UTC (rev 39176) +++ CMSContainer/branches/b1_6/CMSContainer_Demo/demo.cmscontainer.org/war-single/src/webapp/META-INF/context.xml 2009-10-16 11:52:09 UTC (rev 39177) @@ -89,7 +89,7 @@ <Environment name="mmbase/imaging/ImageConvert.ConverterRoot" value="" type="java.lang.String" /> <!-- Contains value 'live' or 'staging' to determine whether this server is Live or Staging. --> - <Environment name="server/LiveOrStaging" value="staging" type="java.lang.String" /> + <Environment name="server/LiveOrStaging" value="single" type="java.lang.String" /> <!-- This entry defines whether this server includes the servername to lookup portal pages. --> <Environment name="server/useServerName" value="false" type="java.lang.String" /> <!-- Contains value 'true' or 'false' to indicate whether or not this is the production system --> Modified: CMSContainer/branches/b1_6/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/META-INF/context.xml =================================================================== --- CMSContainer/branches/b1_6/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/META-INF/context.xml 2009-10-16 11:52:04 UTC (rev 39176) +++ CMSContainer/branches/b1_6/CMSContainer_Demo/m2archetype/war-single-archetype/src/main/resources/archetype-resources/src/webapp/META-INF/context.xml 2009-10-16 11:52:09 UTC (rev 39177) @@ -89,7 +89,7 @@ <Environment name="mmbase/imaging/ImageConvert.ConverterRoot" value="" type="java.lang.String" /> <!-- Contains value 'live' or 'staging' to determine whether this server is Live or Staging. --> - <Environment name="server/LiveOrStaging" value="staging" type="java.lang.String" /> + <Environment name="server/LiveOrStaging" value="single" type="java.lang.String" /> <!-- This entry defines whether this server includes the servername to lookup portal pages. --> <Environment name="server/useServerName" value="false" type="java.lang.String" /> <!-- Contains value 'true' or 'false' to indicate whether or not this is the production system --> Modified: CMSContainer/branches/b1_6/CMSContainer_Templates/single/war/src/webapp/META-INF/context.xml =================================================================== --- CMSContainer/branches/b1_6/CMSContainer_Templates/single/war/src/webapp/META-INF/context.xml 2009-10-16 11:52:04 UTC (rev 39176) +++ CMSContainer/branches/b1_6/CMSContainer_Templates/single/war/src/webapp/META-INF/context.xml 2009-10-16 11:52:09 UTC (rev 39177) @@ -96,7 +96,7 @@ <!-- <Environment name="mmbase/rmmci/RMIRegistryServer" value="localhost" type="java.lang.String" /> --> <!-- Contains value 'live' or 'staging' to determine whether this server is Live or Staging. --> - <Environment name="server/LiveOrStaging" value="staging" type="java.lang.String" /> + <Environment name="server/LiveOrStaging" value="single" type="java.lang.String" /> <!-- This entry defines whether this server includes the servername to lookup portal pages. --> <Environment name="server/useServerName" value="false" type="java.lang.String" /> <!-- Contains value 'true' or 'false' to indicate whether or not this is the production system --> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs