Closed ren-zhijun-oracle closed 8 years ago
ren-zhijun-oracle
commented
6 years ago ren-zhijun-oracle
commented
8 years ago @javaserverfaces Commented Reported by @ruolli
ren-zhijun-oracle
commented
8 years ago @javaserverfaces Commented @ruolli said:
The fix has been submitted as below details show.
=======================
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $ git push
warning: push.default is unset; its implicit value is changing in
Git 2.0 from 'matching' to 'simple'. To squelch this message
and maintain the current behavior after the default changes, use:
git config --global push.default matching
To squelch this message and adopt the new behavior now, use:
git config --global push.default simple
When push.default is set to 'matching', git will push local branches
to the remote branches that already exist with the same name.
In Git 2.0, Git will default to the more conservative 'simple'
behavior, which only pushes the current branch to the corresponding
remote branch that 'git pull' uses to update the current branch.
See 'git help config' and search for 'push.default' for further information.
(the 'simple' mode was introduced in Git 1.7.11\. Use the similar mode
'current' instead of 'simple' if you sometimes use older versions of Git)
The authenticity of host 'git.java.net (137.254.56.48)' can't be established.
RSA key fingerprint is 83:03:d1:6e:8f:84:b0:89:39:e4:70:9d:53:1b:c8:54.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added 'git.java.net,137.254.56.48' (RSA) to the list of known hosts.
Counting objects: 51, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.27 KiB | 0 bytes/s, done.
Total 14 (delta 13), reused 0 (delta 0)
To ssh://ruolli@git.java.net/mojarra~git
3eb1595..573080c 2.1.20 -> 2.1.20
5d1b89d..03ee710 2.2.8 -> 2.2.8
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $ git branch -v
2.1.20 573080c https://java.net/jira/browse/JAVASERVERFACES-4086
2.1.29 6c1b84c Make Git migration happy
2.1.7d3e7528 Fixes YUI compressor
* 2.2.803ee710 https://java.net/jira/browse/JAVASERVERFACES-4085
MOJARRA_2_1X_ROLLING 56cba92 Fixes https://java.net/jira/browse/JAVASERVERFACES-3544, minor test changes to make sure it also passes on Tomcat
MOJARRA_2_2X_ROLLING b715511 Make Git migration happy
master f5baebd Revert "JAVASERVERFACES-4075 -- fix when using simple postback without AJAX"
vdldocsJAVADOCS 66d2997 vdldocs link update
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $
=======================
The actual diff is as below.
=======================
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $ git branch
2.1.20
2.1.29
2.1.7
* 2.2.8
MOJARRA_2_1X_ROLLING
MOJARRA_2_2X_ROLLING
master
vdldocsJAVADOCS
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $ gitk
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $ git diff HEAD~ HEAD
diff --git a/jsf-ri/build.xml b/jsf-ri/build.xml
index ed6b0d9..178d0e4 100644
--- a/jsf-ri/build.xml
+++ b/jsf-ri/build.xml
@@ -548,10 +548,12 @@
</copy>
<copy failonerror="false" overwrite="true" todir="${build.dir}/vdldocs/facelets/h">
<fileset dir="${basedir}/../jsf-api/build/generate/facesdoc/HTML_BASIC">
- <include name="javax.faces.Outputjavax.faces.resource.Script.html" />
</fileset>
</copy>
-
+ <copy failonerror="false" overwrite="true" todir="${build.dir}/vdldocs/javadocs">
+ <fileset dir="${basedir}/../jsf-api/build/javadocs">
+ </fileset>
+ </copy>
</target>
diff --git a/jsf-ri/conf/share/facelets_jsf_core.tld b/jsf-ri/conf/share/facelets_jsf_core.tld
index 828a7ea..ae09c68 100644
--- a/jsf-ri/conf/share/facelets_jsf_core.tld
+++ b/jsf-ri/conf/share/facelets_jsf_core.tld
@@ -2443,7 +2443,7 @@ will not pass validation.</p> ]]>
<p class="changed_added_2_0"><span
class="changed_modified_2_0_rev_a changed_modified_2_2">Used</span> inside of the
metadata facet of a view, this tag causes a <a target="_"
- href="../../../javadocs/javax/faces/component/UIViewParameter.html">UIViewParameter</a>
+ href="../../../vdldocs/javadocs/javax/faces/component/UIViewParameter.html">UIViewParameter</a>
to be attached as metadata for the current view. Because
<code>UIViewParameter</code> extends <code>UIInput</code>
all of the attributes and nested child content for any
ruolli@ruolli-Ubuntu: ~/GIT/mojarra~git $
=======================@javaserverfaces Commented Issue-Links: clones JAVASERVERFACES-4084
ren-zhijun-oracle
commented
8 years ago @javaserverfaces Commented Was assigned to ren.zhijun.oracle
ren-zhijun-oracle
commented
7 years ago @javaserverfaces Commented This issue was imported from java.net JIRA JAVASERVERFACES-4085
ren-zhijun-oracle
commented
8 years ago @javaserverfaces Commented Marked as fixed on Thursday, March 17th 2016, 10:41:35 pm
Hi Ed and Manfred,
FYI on the 404 error in the javadocs for your area
Sophia
-------- Forwarded Message -------- Subject: Documentation forum thread: "Broken link in JSF 2.1 and JSF 2.2 tag documentation" Date: Wed, 25 Nov 2015 11:13:11 -0500 From: Chuck Murray charles.murray@oracle.com Organization: Oracle Corporation To: Sophia Mikulinski sophia.mikulinsky@oracle.com CC: charles.murray@oracle.com, Eric Jendrock eric.jendrock@oracle.com, Camilla Haase camilla.haase@oracle.com
Hi Sophia,
I contacted Eric Jendrock initially about this, but he suggested contacting you. I'm sending this only because one of my assigned tasks is to monitor the Documentation forum on OTN (i.e., public forum), and I believe that you are the actual "owner" of the JavaServer Faces Facelets Tag Documentation, Release 2.2.
The recent "Broken link in JSF 2.1 and JSF 2.2 tag documentation" thread points out some broken links. Can you either check into the extent of the problems and do the fixes, or pass this along to the appropriate person?
You (or someone you may you pass this along to) are welcome to reply in the forum, or to tell me what to post as a reply if you'd prefer not to post there.
Thanks.
–
Chuck Murray, charles.murray@oracle.com, 603-897-3155 Oracle Corporation, One Oracle Drive, Nashua, NH 03062
Affected Versions
[2.3.0-m04]