Merge from JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1498514 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1498557 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1498919 13f79535-47bb-0310-9956-ffa450edef68
Merge the change from JDK7 branch which removed the automatic inference of OnlineResource.protocol property.
This feature is considered not ready for the 0.3 release. See http://issues.apache.org/jira/browse/SIS-110


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1499410 13f79535-47bb-0310-9956-ffa450edef68
Merge last-minute bug fix from JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1499443 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1499821 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1501153 13f79535-47bb-0310-9956-ffa450edef68
Upgraded version number from 0.3-SNAPSHOT to 0.4-SNAPSHOT.

git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1502499 13f79535-47bb-0310-9956-ffa450edef68
Merge from the JDK6 branch.


git-svn-id: https://svn.apache.org/repos/asf/sis/trunk@1506997 13f79535-47bb-0310-9956-ffa450edef68
SVN merge info.

git-svn-id: https://svn.apache.org/repos/asf/sis/branches/JDK6@1507023 13f79535-47bb-0310-9956-ffa450edef68