You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2015/06/14 19:01:50 UTC
svn commit: r1685426 - in /webservices/axiom/branches/attrs-aspects: ./
devguide/src/docbkx/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/
Author: veithen
Date: Sun Jun 14 17:01:50 2015
New Revision: 1685426
URL: http://svn.apache.org/r1685426
Log:
Merge latest changes from trunk.
Added:
webservices/axiom/branches/attrs-aspects/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
- copied unchanged from r1685423, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
Modified:
webservices/axiom/branches/attrs-aspects/ (props changed)
webservices/axiom/branches/attrs-aspects/devguide/src/docbkx/devguide.xml
webservices/axiom/branches/attrs-aspects/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Propchange: webservices/axiom/branches/attrs-aspects/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 14 17:01:50 2015
@@ -10,4 +10,4 @@
/webservices/axiom/branches/JAXB2_DS:1366463-1367737
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1685218-1685225
+/webservices/axiom/trunk:1685218-1685423
Modified: webservices/axiom/branches/attrs-aspects/devguide/src/docbkx/devguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/attrs-aspects/devguide/src/docbkx/devguide.xml?rev=1685426&r1=1685425&r2=1685426&view=diff
==============================================================================
--- webservices/axiom/branches/attrs-aspects/devguide/src/docbkx/devguide.xml (original)
+++ webservices/axiom/branches/attrs-aspects/devguide/src/docbkx/devguide.xml Sun Jun 14 17:01:50 2015
@@ -1259,9 +1259,10 @@ javax.xml.stream.XMLOutputFactory=com.be
<para>
Publish the site:
</para>
-<screen>svn merge \
- https://svn.apache.org/repos/asf/webservices/website/axiom-staging \
- https://svn.apache.org/repos/asf/webservices/website/axiom</screen>
+<screen>svn co https://svn.apache.org/repos/asf/webservices/website/axiom axiom-site
+cd axiom-site/
+svn merge https://svn.apache.org/repos/asf/webservices/website/axiom-staging
+svn commit</screen>
</step>
</procedure>
<para>
Modified: webservices/axiom/branches/attrs-aspects/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/attrs-aspects/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1685426&r1=1685425&r2=1685426&view=diff
==============================================================================
--- webservices/axiom/branches/attrs-aspects/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/attrs-aspects/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Sun Jun 14 17:01:50 2015
@@ -517,6 +517,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.sourcedelement.TestCloseOnComplete(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestComplete(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestExpand(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetAllAttributes(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetDocumentFromBuilder(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceNormalized(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceNormalized2(metaFactory));