Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e4x bugfix + dependency update #1

Merged
merged 2 commits into from
Jun 17, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions testsrc/jstests/577141.jstest
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
var ns = new Namespace( "dc", "http://purl.org/dc/elements/1.1" );
var x = new XML( "<something/>" );
x.setNamespace( ns );
"success";
6 changes: 3 additions & 3 deletions xmlimplsrc/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
<target name="xmlbeans-get" unless="xmlbeans-zip-present?">
<property
name="xmlbeans.url"
value="http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"
value="http://www.apache.org/dist/xmlbeans/binaries/xmlbeans-2.5.0.zip"
/>

<mkdir dir="${xmlbeans.tmp}" />
Expand All @@ -157,8 +157,8 @@
<target name="xmlbeans-unzip" unless="xmlbeans-present?">
<antcall target="xmlbeans-get" />
<unzip src="${xmlbeans.zip}" dest="${xmlbeans.tmp}" />
<copy tofile="${xbean.jar}" file="${xmlbeans.tmp}/xmlbeans-2.2.0/lib/xbean.jar" />
<copy tofile="${jsr173.jar}" file="${xmlbeans.tmp}/xmlbeans-2.2.0/lib/jsr173_1.0_api.jar" />
<copy tofile="${xbean.jar}" file="${xmlbeans.tmp}/xmlbeans-2.5.0/lib/xbean.jar" />
<copy tofile="${jsr173.jar}" file="${xmlbeans.tmp}/xmlbeans-2.5.0/lib/jsr173_1.0_api.jar" />
<delete dir="${xmlbeans.tmp}" />
</target>
</project>
2 changes: 1 addition & 1 deletion xmlimplsrc/org/mozilla/javascript/xmlimpl/QName.java
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ QName newQName(XMLLibImpl lib, String q_uri, String q_localName, String q_prefix
}
XmlNode.Namespace ns = null;
if (q_prefix != null) {
ns = XmlNode.Namespace.create(q_uri, q_prefix);
ns = XmlNode.Namespace.create(q_prefix, q_uri);
} else if (q_uri != null) {
ns = XmlNode.Namespace.create(q_uri);
} else {
Expand Down