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 2013/05/12 19:25:40 UTC
svn commit: r1481612 [2/2] - in /myfaces/core/branches/2.1.x-client-window:
./ api/src/main/java/javax/faces/component/
api/src/main/javascript/META-INF/resources/myfaces/_impl/_util/
impl/src/main/java/org/apache/myfaces/application/ impl/src/main/jav...
Modified: myfaces/core/branches/2.1.x-client-window/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/parent/pom.xml?rev=1481612&r1=1481611&r2=1481612&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/parent/pom.xml (original)
+++ myfaces/core/branches/2.1.x-client-window/parent/pom.xml Sun May 12 17:25:39 2013
@@ -112,6 +112,26 @@
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
+ <tryUpdate>true</tryUpdate>
+ <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
+ <content>\${siteContent.path}</content>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
+ <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+ </configuration>
+ </plugin>
+
</plugins>
<pluginManagement>
@@ -176,7 +196,7 @@
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
@@ -575,12 +595,30 @@
</repositories>
+ <!--
<distributionManagement>
<site>
<id>apache.website</id>
<name>Apache Website</name>
<url>scpexe://people.apache.org/www/myfaces.apache.org/core21/</url>
</site>
- </distributionManagement>
+ </distributionManagement>-->
+ <distributionManagement>
+ <site>
+ <id>myfaces-local-staging</id>
+ <name>Apache Website</name>
+ <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <siteModule.path>core21</siteModule.path>
+ <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
+ <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
+ <!-- it's a default location for performance reason (not checkout the content all the time)
+ you can override this value in your settings. -->
+ <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
+ <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
+ <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
+ </properties>
</project>
Propchange: myfaces/core/branches/2.1.x-client-window/parent/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/branches/2.1.x/parent/pom.xml:r1469145,1469329,1470543,1470662,1470740,1470769
Merged /myfaces/core/trunk/parent/pom.xml:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Propchange: myfaces/core/branches/2.1.x-client-window/parent/src/
------------------------------------------------------------------------------
Merged /myfaces/core/branches/2.1.x/parent/src:r1469145,1469329,1470543,1470662,1470740,1470769
Merged /myfaces/core/trunk/parent/src:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Modified: myfaces/core/branches/2.1.x-client-window/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/pom.xml?rev=1481612&r1=1481611&r2=1481612&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/pom.xml (original)
+++ myfaces/core/branches/2.1.x-client-window/pom.xml Sun May 12 17:25:39 2013
@@ -72,6 +72,35 @@
</extension>
</extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-publish-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <pubScmUrl>${siteScmPublish.url}</pubScmUrl>
+ <tryUpdate>true</tryUpdate>
+ <checkoutDirectory>${scmCheckout.path}</checkoutDirectory>
+ <content>\${siteContent.path}</content>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <stagingRepositoryId>myfaces-local-staging</stagingRepositoryId>
+ <stagingSiteURL>${siteDeploy.url}</stagingSiteURL>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<profiles>
@@ -150,6 +179,7 @@
</repositories>
+ <!--
<distributionManagement>
<site>
<id>apache.website</id>
@@ -157,5 +187,27 @@
<url>scpexe://people.apache.org/www/myfaces.apache.org/core20/module</url>
</site>
</distributionManagement>
+ -->
+ <!-- To deploy the site, use site:stage-deploy goal and commit changes manually on
+ https://svn.apache.org/repos/asf/myfaces/site/publish/
+
+ -->
+ <distributionManagement>
+ <site>
+ <id>myfaces-local-staging</id>
+ <name>Apache Website</name>
+ <url>scp://localhost/${user.home}/myfaces-site/${siteModule.path}</url>
+ </site>
+ </distributionManagement>
+ <properties>
+ <siteModule.path>core21/module</siteModule.path>
+ <site.mainDirectory>${user.home}/myfaces-site/checkout</site.mainDirectory>
+ <siteContent.path>${user.home}/myfaces-site/site/${siteModule.path}</siteContent.path>
+ <!-- it's a default location for performance reason (not checkout the content all the time)
+ you can override this value in your settings. -->
+ <scmCheckout.path>\${site.mainDirectory}/${siteModule.path}</scmCheckout.path>
+ <siteDeploy.url>file://${user.home}/myfaces-site/site/${siteModule.path}</siteDeploy.url>
+ <siteScmPublish.url>scm:svn:https://svn.apache.org/repos/asf/myfaces/site/publish/</siteScmPublish.url>
+ </properties>
</project>
\ No newline at end of file
Propchange: myfaces/core/branches/2.1.x-client-window/shared/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Merged /myfaces/core/branches/2.1.x/shared:r1469145,1469329,1470543,1470662,1470740,1470769
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/pom.xml
------------------------------------------------------------------------------
Merged /myfaces/core/branches/2.1.x/shared-public/pom.xml:r1469145,1469329,1470543,1470662,1470740,1470769
Merged /myfaces/core/trunk/shared-public/pom.xml:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Merged /myfaces/core/branches/2.1.x/shared-public/src:r1469145,1469329,1470543,1470662,1470740,1470769
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Merged /myfaces/core/branches/2.1.x/shared-public/src/main/java/org/apache/myfaces/shared/util/AttachedDeltaWrapper.java:r1469145,1469329,1470543,1470662,1470740,1470769
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/branches/2.1.x/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java:r1469145,1469329,1470543,1470662,1470740,1470769
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/ComponentUtils.java:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/branches/2.1.x/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java:r1469145,1469329,1470543,1470662,1470740,1470769
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/DebugUtils.java:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/branches/2.1.x/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java:r1469145,1469329,1470543,1470662,1470740,1470769
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/RendererUtils.java:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Merged /myfaces/core/branches/2.1.x/shared-public/src/main/java/org/apache/myfaces/shared/util/TagUtils.java:r1469145,1469329,1470543,1470662,1470740,1470769
Propchange: myfaces/core/branches/2.1.x-client-window/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit/
------------------------------------------------------------------------------
Merged /myfaces/core/trunk/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit:r1433542,1448215,1448221,1449029,1449777,1451580,1455392,1461879,1461883,1461890,1461893,1461916,1462113,1467143
Merged /myfaces/core/branches/2.1.x/shared-public/src/main/java/org/apache/myfaces/shared/util/renderkit:r1469145,1469329,1470543,1470662,1470740,1470769
Modified: myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java?rev=1481612&r1=1481611&r2=1481612&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java (original)
+++ myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlBodyRendererBase.java Sun May 12 17:25:39 2013
@@ -105,7 +105,7 @@ public class HtmlBodyRendererBase extend
if (isCommonPropertiesOptimizationEnabled(facesContext))
{
HtmlRendererUtils.renderHTMLAttributes(writer, component,
- HTML.BODY_ATTRIBUTES);
+ HTML.BODY_ATTRIBUTES_WITHOUT_EVENTS);
CommonPropertyUtils.renderCommonPassthroughPropertiesWithoutEvents(writer,
CommonPropertyUtils.getCommonPropertiesMarked(component), component);
}
Modified: myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java?rev=1481612&r1=1481611&r2=1481612&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java (original)
+++ myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java Sun May 12 17:25:39 2013
@@ -53,6 +53,13 @@ public final class HtmlJavaScriptUtils
public static void renderFormSubmitScript(FacesContext facesContext)
throws IOException
{
+ if (facesContext.getPartialViewContext() != null &&
+ (facesContext.getPartialViewContext().isPartialRequest() ||
+ facesContext.getPartialViewContext().isAjaxRequest() )
+ )
+ {
+ return;
+ }
Map map = facesContext.getExternalContext().getRequestMap();
Boolean firstScript = (Boolean) map.get(FIRST_SUBMIT_SCRIPT_ON_PAGE);
Modified: myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=1481612&r1=1481611&r2=1481612&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Sun May 12 17:25:39 2013
@@ -1015,7 +1015,7 @@ public class HtmlResponseWriterImpl
closeStartTagIfNecessary();
// empty string commonly used to force the start tag to be closed.
// in such case, do not call down the writer chain
- if (str.length() > 0)
+ if (str != null && str.length() > 0)
{
// Don't bother encoding anything if chosen character encoding is UTF-8
if (_isUTF8)
Modified: myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceUtils.java?rev=1481612&r1=1481611&r2=1481612&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceUtils.java (original)
+++ myfaces/core/branches/2.1.x-client-window/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/ResourceUtils.java Sun May 12 17:25:39 2013
@@ -189,7 +189,10 @@ public class ResourceUtils
// Check if this is an ajax request. If so, we don't need to include it, because that was
// already done and in the worst case, jsf script was already loaded on the page.
- if (facesContext.getPartialViewContext() != null && facesContext.getPartialViewContext().isAjaxRequest())
+ if (facesContext.getPartialViewContext() != null &&
+ (facesContext.getPartialViewContext().isPartialRequest() ||
+ facesContext.getPartialViewContext().isAjaxRequest() )
+ )
{
return;
}
@@ -246,7 +249,10 @@ public class ResourceUtils
//we only are allowed to do this on partial requests
//because on normal requests a static viewroot still could mean that a full page refresh is performed
//only in a ppr case this means we have the script already loaded and parsed
- if (facesContext.getPartialViewContext() != null && facesContext.getPartialViewContext().isPartialRequest())
+ if (facesContext.getPartialViewContext() != null &&
+ (facesContext.getPartialViewContext().isPartialRequest() ||
+ facesContext.getPartialViewContext().isAjaxRequest() )
+ )
{
return;
}