October 2008 - dna-commits - Jboss List Archives

DNA SVN: r591 - trunk/dna-common/src/main/java/org/jboss/dna/common/util.

by dna-commits＠lists.jboss.org

Author: jverhaeg(a)redhat.com Date: 2008-10-28 13:53:24 -0400 (Tue, 28 Oct 2008) New Revision: 591 Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/util/StringUtil.java Log: Added constant for empty string Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/util/StringUtil.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/util/StringUtil.java 2008-10-28 03:01:03 UTC (rev 590) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/util/StringUtil.java 2008-10-28 17:53:24 UTC (rev 591) @@ -45,6 +45,7 @@ */ public class StringUtil { + public static final String EMPTY_STRING = ""; public static final String[] EMPTY_STRING_ARRAY = new String[0]; private static final Pattern NORMALIZE_PATTERN = Pattern.compile("\\s+"); private static final Pattern PARAMETER_COUNT_PATTERN = Pattern.compile("\\{(\\d+)\\}");

15 years, 6 months

1
0
0 / 0

DNA SVN: r590 - in trunk: dna-common/src/test/java/org/jboss/dna/common/text and 5 other directories.

by dna-commits＠lists.jboss.org

Author: rhauch Date: 2008-10-27 23:01:03 -0400 (Mon, 27 Oct 2008) New Revision: 590 Added: trunk/dna-common/src/main/java/org/jboss/dna/common/text/XmlNameEncoder.java trunk/dna-common/src/test/java/org/jboss/dna/common/text/XmlNameEncoderTest.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlHandler.java trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlHandlerTest.java trunk/dna-graph/src/test/resources/xmlHandler/ trunk/dna-graph/src/test/resources/xmlHandler/docWithComments.xml trunk/dna-graph/src/test/resources/xmlHandler/docWithNamespaces.xml trunk/dna-graph/src/test/resources/xmlHandler/docWithNestedNamespaces.xml trunk/dna-graph/src/test/resources/xmlHandler/docWithOnlyRootElement.xml trunk/dna-graph/src/test/resources/xmlHandler/docWithoutNamespaces.xml Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java Log: DNA-242 - Change the XML importer code to no longer use XmlSequencer http://jira.jboss.com/jira/browse/DNA-242 Added new XmlHandler implementation (which subclasses DefaultHandler2 and overrides the appropriate methods) with a unit test that verifies the behavior. It is designed to be used with a regular org.xml.sax.XMLReader implementation, but processes the XML content and creates the nodes that represent that content. And while the current component should be perfect for importing XML content into a repository, it can also be subclassed with other DefaultHandler2 methods being overridden to handle other parts of the XML content, including XML comments, DTD entities, entity resolution, etc. This approach of specializing a DefaultHandler2 implementation is much more extensible and customizable than providing an "importer" component. Added: trunk/dna-common/src/main/java/org/jboss/dna/common/text/XmlNameEncoder.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/text/XmlNameEncoder.java (rev 0) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/text/XmlNameEncoder.java 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,517 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.common.text; + +import java.text.CharacterIterator; +import java.text.StringCharacterIterator; +import java.util.BitSet; + +/** + * An {@link TextEncoder encoder} and {@link TextDecoder decoder} for XML element and attribute names. + * + * Any UTF-16 unicode character that is not a valid XML name character according to the <a + * href="http://www.w3.org/TR/REC-xml/#sec-common-syn">World Wide Web Consortium (W3C) Extensible Markup Language (XML) 1.0 + * (Fourth Edition) Recommendation</a> is escaped as <code>_xHHHH_</code>, where <code>HHHH</code> stands for the four-digit + * hexadecimal UTF-16 unicode value for the character in the most significant bit first order. For example, the name "Customer_ID" + * is encoded as "Customer_x0020_ID". + * + * + * Decoding transforms every <code>_xHHHH_</code> encoding sequences back into the UTF-16 character. Note that + * {@link #decode(String) decoding} can be safely done on any XML name, even if the name does not contain any encoded sequences. + * + * + * @author Randall Hauch + */ +public class XmlNameEncoder implements TextDecoder, TextEncoder { + + private static final BitSet XML_NAME_ALLOWED_CHARACTERS = new BitSet(2 ^ 16); + + static { + // Initialize the unescaped bitset ... + + // XML Names may contain: Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender + XML_NAME_ALLOWED_CHARACTERS.set('.'); + XML_NAME_ALLOWED_CHARACTERS.set('-'); + XML_NAME_ALLOWED_CHARACTERS.set('_'); + XML_NAME_ALLOWED_CHARACTERS.set(':'); + + // XML Base Character Set + XML_NAME_ALLOWED_CHARACTERS.set('\u0041', '\u005A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0061', '\u007A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u00C0', '\u00D6' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u00D8', '\u00F6' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u00F8', '\u00FF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0100', '\u0131' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0134', '\u013E' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0141', '\u0148' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u014A', '\u017E' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0180', '\u01C3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u01CD', '\u01F0' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u01F4', '\u01F5' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u01FA', '\u0217' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0250', '\u02A8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u02BB', '\u02C1' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0386'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0388', '\u038A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u038C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u038E', '\u03A1' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u03A3', '\u03CE' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u03D0', '\u03D6' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u03DA'); + XML_NAME_ALLOWED_CHARACTERS.set('\u03DC'); + XML_NAME_ALLOWED_CHARACTERS.set('\u03DE'); + XML_NAME_ALLOWED_CHARACTERS.set('\u03E0'); + XML_NAME_ALLOWED_CHARACTERS.set('\u03E2', '\u03F3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0401', '\u040C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u040E', '\u044F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0451', '\u045C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u045E', '\u0481' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0490', '\u04C4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u04C7', '\u04C8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u04CB', '\u04CC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u04D0', '\u04EB' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u04EE', '\u04F5' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u04F8', '\u04F9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0531', '\u0556' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0559'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0561', '\u0586' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u05D0', '\u05EA' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u05F0', '\u05F2' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0621', '\u063A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0641', '\u064A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0671', '\u06B7' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06BA', '\u06BE' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06C0', '\u06CE' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06D0', '\u06D3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06D5'); + XML_NAME_ALLOWED_CHARACTERS.set('\u06E5', '\u06E6' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0905', '\u0939' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u093D'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0958', '\u0961' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0985', '\u098C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u098F', '\u0990' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0993', '\u09A8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09AA', '\u09B0' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09B2'); + XML_NAME_ALLOWED_CHARACTERS.set('\u09B6', '\u09B9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09DC', '\u09DD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09DF', '\u09E1' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09F0', '\u09F1' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A05', '\u0A0A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A0F', '\u0A10' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A13', '\u0A28' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A2A', '\u0A30' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A32', '\u0A33' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A35', '\u0A36' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A38', '\u0A39' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A59', '\u0A5C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A5E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A72', '\u0A74' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A85', '\u0A8B' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A8D'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A8F', '\u0A91' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A93', '\u0AA8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0AAA', '\u0AB0' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0AB2', '\u0AB3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0AB5', '\u0AB9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0ABD'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0AE0'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B05', '\u0B0C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B0F', '\u0B10' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B13', '\u0B28' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B2A', '\u0B30' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B32', '\u0B33' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B36', '\u0B39' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B3D'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B5C', '\u0B5D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B5F', '\u0B61' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B85', '\u0B8A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B8E', '\u0B90' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B92', '\u0B95' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B99', '\u0B9A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B9C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B9E', '\u0B9F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BA3', '\u0BA4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BA8', '\u0BAA' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BAE', '\u0BB5' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BB7', '\u0BB9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C05', '\u0C0C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C0E', '\u0C10' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C12', '\u0C28' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C2A', '\u0C33' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C35', '\u0C39' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C60', '\u0C61' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C85', '\u0C8C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C8E', '\u0C90' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C92', '\u0CA8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CAA', '\u0CB3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CB5', '\u0CB9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CDE'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CE0', '\u0CE1' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D05', '\u0D0C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D0E', '\u0D10' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D12', '\u0D28' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D2A', '\u0D39' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D60', '\u0D61' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E01', '\u0E2E' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E30'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E32', '\u0E33' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E40', '\u0E45' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E81', '\u0E82' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E84'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E87', '\u0E88' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E8A'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E8D'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E94', '\u0E97' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E99', '\u0E9F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EA1', '\u0EA3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EA5'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EA7'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EAA', '\u0EAB' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EAD', '\u0EAE' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EB0'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EB2', '\u0EB3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EBD'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EC0', '\u0EC4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F40', '\u0F47' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F49', '\u0F69' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u10A0', '\u10C5' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u10D0', '\u10F6' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1100'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1102', '\u1103' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1105', '\u1107' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1109'); + XML_NAME_ALLOWED_CHARACTERS.set('\u110B', '\u110C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u110E', '\u1112' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u113C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u113E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1140'); + XML_NAME_ALLOWED_CHARACTERS.set('\u114C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u114E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1150'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1154', '\u1155' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1159'); + XML_NAME_ALLOWED_CHARACTERS.set('\u115F', '\u1161' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1163'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1165'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1167'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1169'); + XML_NAME_ALLOWED_CHARACTERS.set('\u116D', '\u116E' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1172', '\u1173' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1175'); + XML_NAME_ALLOWED_CHARACTERS.set('\u119E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u11A8'); + XML_NAME_ALLOWED_CHARACTERS.set('\u11AB'); + XML_NAME_ALLOWED_CHARACTERS.set('\u11AE', '\u11AF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u11B7', '\u11B8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u11BA'); + XML_NAME_ALLOWED_CHARACTERS.set('\u11BC', '\u11C2' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u11EB'); + XML_NAME_ALLOWED_CHARACTERS.set('\u11F0'); + XML_NAME_ALLOWED_CHARACTERS.set('\u11F9'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1E00', '\u1E9B' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1EA0', '\u1EF9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F00', '\u1F15' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F18', '\u1F1D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F20', '\u1F45' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F48', '\u1F4D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F50', '\u1F57' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F59'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F5B'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F5D'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F5F', '\u1F7D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1F80', '\u1FB4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FB6', '\u1FBC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FBE'); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FC2', '\u1FC4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FC6', '\u1FCC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FD0', '\u1FD3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FD6', '\u1FDB' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FE0', '\u1FEC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FF2', '\u1FF4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u1FF6', '\u1FFC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u2126'); + XML_NAME_ALLOWED_CHARACTERS.set('\u212A', '\u212B' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u212E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u2180', '\u2182' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u3041', '\u3094' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u30A1', '\u30FA' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u3105', '\u312C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\uAC00', '\uD7A3' + 1); + + // XML Ideograph Character Set + + XML_NAME_ALLOWED_CHARACTERS.set('\u4E00', '\u9FA5' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u3007'); + XML_NAME_ALLOWED_CHARACTERS.set('\u3021', '\u3029' + 1); + + // XML Combining Character Set + + XML_NAME_ALLOWED_CHARACTERS.set('\u0300', '\u0345' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0360', '\u0361' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0483', '\u0486' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0591', '\u05A1' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u05A3', '\u05B9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u05BB', '\u05BD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u05BF'); + XML_NAME_ALLOWED_CHARACTERS.set('\u05C1', '\u05C2' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u05C4'); + XML_NAME_ALLOWED_CHARACTERS.set('\u064B', '\u0652' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0670'); + XML_NAME_ALLOWED_CHARACTERS.set('\u06D6', '\u06DC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06DD', '\u06DF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06E0', '\u06E4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06E7', '\u06E8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06EA', '\u06ED' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0901', '\u0903' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u093C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u093E', '\u094C' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u094D'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0951', '\u0954' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0962', '\u0963' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0981', '\u0983' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09BC'); + XML_NAME_ALLOWED_CHARACTERS.set('\u09BE'); + XML_NAME_ALLOWED_CHARACTERS.set('\u09BF'); + XML_NAME_ALLOWED_CHARACTERS.set('\u09C0', '\u09C4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09C7', '\u09C8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09CB', '\u09CD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09D7'); + XML_NAME_ALLOWED_CHARACTERS.set('\u09E2', '\u09E3' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A02'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A3C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A3E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A3F'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A40', '\u0A42' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A47', '\u0A48' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A4B', '\u0A4D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A70', '\u0A71' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A81', '\u0A83' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0ABC'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0ABE', '\u0AC5' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0AC7', '\u0AC9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0ACB', '\u0ACD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B01', '\u0B03' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B3C'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B3E', '\u0B43' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B47', '\u0B48' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B4B', '\u0B4D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B56', '\u0B57' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B82', '\u0B83' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BBE', '\u0BC2' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BC6', '\u0BC8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BCA', '\u0BCD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BD7'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C01', '\u0C03' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C3E', '\u0C44' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C46', '\u0C48' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C4A', '\u0C4D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C55', '\u0C56' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C82', '\u0C83' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CBE', '\u0CC4' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CC6', '\u0CC8' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CCA', '\u0CCD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CD5', '\u0CD6' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D02', '\u0D03' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D3E', '\u0D43' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D46', '\u0D48' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D4A', '\u0D4D' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D57'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E31'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E34', '\u0E3A' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E47', '\u0E4E' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EB1'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EB4', '\u0EB9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EBB', '\u0EBC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EC8', '\u0ECD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F18', '\u0F19' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F35'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F37'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F39'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F3E'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F3F'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F71', '\u0F84' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F86', '\u0F8B' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F90', '\u0F95' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F97'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F99', '\u0FAD' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0FB1', '\u0FB7' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0FB9'); + XML_NAME_ALLOWED_CHARACTERS.set('\u20D0', '\u20DC' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u20E1'); + XML_NAME_ALLOWED_CHARACTERS.set('\u302A', '\u302F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u3099'); + XML_NAME_ALLOWED_CHARACTERS.set('\u309A'); + + // XML Digits + XML_NAME_ALLOWED_CHARACTERS.set('\u0030', '\u0039' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0660', '\u0669' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u06F0', '\u06F9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0966', '\u096F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u09E6', '\u09EF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0A66', '\u0A6F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0AE6', '\u0AEF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0B66', '\u0B6F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0BE7', '\u0BEF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0C66', '\u0C6F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0CE6', '\u0CEF' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0D66', '\u0D6F' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E50', '\u0E59' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0ED0', '\u0ED9' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u0F20', '\u0F29' + 1); + + // XML Extenders + XML_NAME_ALLOWED_CHARACTERS.set('\u00B7'); + XML_NAME_ALLOWED_CHARACTERS.set('\u02D0'); + XML_NAME_ALLOWED_CHARACTERS.set('\u02D1'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0387'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0640'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0E46'); + XML_NAME_ALLOWED_CHARACTERS.set('\u0EC6'); + XML_NAME_ALLOWED_CHARACTERS.set('\u3005'); + XML_NAME_ALLOWED_CHARACTERS.set('\u3031', '\u3035' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u309D', '\u309E' + 1); + XML_NAME_ALLOWED_CHARACTERS.set('\u30FC', '\u30FE' + 1); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.common.text.TextDecoder#decode(java.lang.String) + */ + public String decode( String encodedText ) { + if (encodedText == null) return null; + if (encodedText.length() < 7) { + // Not big enough to have an encoded sequence + return encodedText; + } + StringBuilder sb = new StringBuilder(); + char[] digits = new char[4]; + CharacterIterator iter = new StringCharacterIterator(encodedText); + for (char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) { + if (c == '_') { + // Read the next character, if there is one ... + char next = iter.next(); + if (next == CharacterIterator.DONE) { + sb.append(c); + break; + } + // If the next character is not 'x', then these are just regular characters ... + if (next != 'x') { + sb.append(c).append(next); + continue; + } + // Read the next 4 characters (digits) and another '_' character ... + digits[0] = iter.next(); + if (digits[0] == CharacterIterator.DONE) { + sb.append(c).append(next); + break; + } + digits[1] = iter.next(); + if (digits[1] == CharacterIterator.DONE) { + sb.append(c).append(next).append(digits, 0, 1); + break; + } + digits[2] = iter.next(); + if (digits[2] == CharacterIterator.DONE) { + sb.append(c).append(next).append(digits, 0, 2); + break; + } + digits[3] = iter.next(); + if (digits[3] == CharacterIterator.DONE) { + sb.append(c).append(next).append(digits, 0, 3); + break; + } + char underscore = iter.next(); + if (underscore != '_') { // includes DONE + sb.append(c).append(next).append(digits, 0, 4); + if (underscore == CharacterIterator.DONE) break; + sb.append(underscore); + continue; + } + // We've read all 4 digits, including the trailing '_' + // Now parse into the resulting character + try { + sb.appendCodePoint(Integer.parseInt(new String(digits), 16)); + } catch (NumberFormatException e) { + // code was not hexadecimal, so just write out the characters as is ... + sb.append(c).append(next).append(digits).append(underscore); + } + } else { + // Just append other characters ... + sb.append(c); + } + } + return sb.toString(); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.common.text.TextEncoder#encode(java.lang.String) + */ + public String encode( String text ) { + if (text == null) return null; + if (text.length() == 0) return text; + StringBuilder sb = new StringBuilder(); + String hex = null; + CharacterIterator iter = new StringCharacterIterator(text); + for (char c = iter.first(); c != CharacterIterator.DONE; c = iter.next()) { + if (c == '_') { + // Read the next character (if there is one) ... + char next = iter.next(); + if (next == CharacterIterator.DONE) { + sb.append(c); + break; + } + // If the next character is not 'x', then these are just regular characters ... + if (next != 'x') { + sb.append(c).append(next); + continue; + } + // The next character is 'x', so write out the '_' character in encoded form ... + sb.append("_x005f_"); + // And then write out the next character ... + sb.append(next); + } else if (XML_NAME_ALLOWED_CHARACTERS.get(c)) { + // Legal characters for an XML Name ... + sb.append(c); + } else { + // All other characters must be escaped with '_xHHHH_' where 'HHHH' is the hex string for the code point + hex = Integer.toHexString(c); + // The hex string excludes the leading '0's, so check the character values so we know how many to prepend + if (c >= '\u0000' && c <= '\u000f') { + sb.append("_x000").append(hex); + } else if (c >= '\u0010' && c <= '\u00ff') { + sb.append("_x00").append(hex); + } else if (c >= '\u0100' && c <= '\u0fff') { + sb.append("_x0").append(hex); + } else { + sb.append("_x").append(hex); + } + sb.append('_'); + } + } + return sb.toString(); + } + +} Property changes on: trunk/dna-common/src/main/java/org/jboss/dna/common/text/XmlNameEncoder.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-common/src/test/java/org/jboss/dna/common/text/XmlNameEncoderTest.java =================================================================== --- trunk/dna-common/src/test/java/org/jboss/dna/common/text/XmlNameEncoderTest.java (rev 0) +++ trunk/dna-common/src/test/java/org/jboss/dna/common/text/XmlNameEncoderTest.java 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,170 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.common.text; + +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; +import org.junit.Before; +import org.junit.Test; + +/** + * @author Randall Hauch + */ +public class XmlNameEncoderTest { + + private XmlNameEncoder encoder = new XmlNameEncoder(); + + @Before + public void beforeEach() { + } + + protected void checkEncoding( String input, + String expected ) { + String output = this.encoder.encode(input); + assertThat(output, is(notNullValue())); + assertEquals(expected, output); + assertThat(output.length(), is(expected.length())); + assertThat(output, is(expected)); + + checkDecoding(output, input); + } + + protected void checkForNoEncoding( String input ) { + String output = this.encoder.encode(input); + assertThat(output, is(notNullValue())); + assertEquals(input, output); + assertThat(output.length(), is(input.length())); + assertThat(output, is(input)); + + checkForNoDecoding(input); + } + + protected void checkForNoDecoding( String input ) { + String output = this.encoder.decode(input); + assertThat(output, is(notNullValue())); + assertEquals(input, output); + assertThat(output.length(), is(input.length())); + assertThat(output, is(input)); + } + + protected void checkDecoding( String input, + String output ) { + String decoded = this.encoder.decode(input); + assertEquals(output, decoded); + assertThat(decoded.length(), is(output.length())); + assertThat(decoded, is(output)); + } + + @Test + public void shouldNotEncodeUnderscoreIfNotFollowedByLowercaseX() { + checkForNoEncoding("Employee_ID"); + checkForNoEncoding("_Employee_"); + checkForNoEncoding("Employee__ID"); + } + + @Test + public void shouldEncodeUnderscoreIfFollowedByLowercaseX() { + checkEncoding("Employee_x", "Employee_x005f_x"); + checkEncoding("Employee_x0", "Employee_x005f_x0"); + checkEncoding("Employee_x0022_", "Employee_x005f_x0022_"); + } + + @Test + public void shouldNotDecodeIfNotValidHexadecimalValue() { + checkForNoDecoding("_xH013_"); + } + + @Test + public void shouldNotDecodeIfNotValidEncodedFormat() { + checkForNoDecoding("_X0022_"); // No lowercase 'x' + checkForNoDecoding("x0022_"); // No leading '_' + checkForNoDecoding("_x0022a"); // No trailing '_' + } + + @Test + public void shouldNotEncodeDigits() { + for (char c = '\u0030'; c <= '\u0039'; c++) { // digit + checkForNoEncoding("Employee" + c + "xyz"); + } + } + + @Test + public void shouldNotEncodeAlphabeticCharacters() { + for (char c = '\u0041'; c <= '\u005a'; c++) { // digit + checkForNoEncoding("Employee" + c + "xyz"); + } + for (char c = '\u0061'; c <= '\u007a'; c++) { // digit + checkForNoEncoding("Employee" + c + "xyz"); + } + } + + @Test + public void shouldNotEncodePeriodOrDashOrUnderscoreCharacters() { + checkForNoEncoding("Employee.xyz"); + checkForNoEncoding("Employee-xyz"); + checkForNoEncoding("Employee:xyz"); + checkForNoEncoding("Employee_abc"); + } + + @Test + public void shouldDecodeIfCompleteHexadecimal() { + checkDecoding("Employee_", "Employee_"); + checkDecoding("Employee_x", "Employee_x"); + checkDecoding("Employee_x0", "Employee_x0"); + checkDecoding("Employee_x00", "Employee_x00"); + checkDecoding("Employee_x002", "Employee_x002"); + checkDecoding("Employee_x0022", "Employee_x0022"); + checkDecoding("_", "_"); + checkDecoding("_x", "_x"); + checkDecoding("_x0", "_x0"); + checkDecoding("_x00", "_x00"); + checkDecoding("_x002", "_x002"); + checkDecoding("_x0022", "_x0022"); + } + + @Test + public void shouldEncodeUnderscoreOnlyWhenFollowedByX() { + checkEncoding("Employee_xyz", "Employee_x005f_xyz"); + checkEncoding("Employee_ayz", "Employee_ayz"); + } + + @Test + public void shouldEncodeNonAlphaNumericCharacters() { + checkEncoding("Employee!xyz", "Employee_x0021_xyz"); + checkEncoding("Employee\"xyz", "Employee_x0022_xyz"); + checkEncoding("Employee#xyz", "Employee_x0023_xyz"); + checkEncoding("Employee$xyz", "Employee_x0024_xyz"); + checkEncoding("Employee%xyz", "Employee_x0025_xyz"); + checkEncoding("Employee&xyz", "Employee_x0026_xyz"); + checkEncoding("Employee'xyz", "Employee_x0027_xyz"); + checkEncoding("Employee(xyz", "Employee_x0028_xyz"); + checkEncoding("Employee)xyz", "Employee_x0029_xyz"); + checkEncoding("Employee*xyz", "Employee_x002a_xyz"); + checkEncoding("Employee+xyz", "Employee_x002b_xyz"); + checkEncoding("Employee,xyz", "Employee_x002c_xyz"); + checkEncoding("Employee/xyz", "Employee_x002f_xyz"); + checkEncoding("Employee\u0B9Bxyz", "Employee_x0b9b_xyz"); + } + +} Property changes on: trunk/dna-common/src/test/java/org/jboss/dna/common/text/XmlNameEncoderTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java 2008-10-28 03:00:46 UTC (rev 589) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/Graph.java 2008-10-28 03:01:03 UTC (rev 590) @@ -527,6 +527,19 @@ } /** + * Begin the request to create a node located at the supplied path. This request is submitted to the repository immediately. + * + * @param at the path to the node that is to be created. + * @param properties the properties for the new node + * @return an object that may be used to start another request + */ + public Conjunction<Graph> create( Path at, + Iterable<Property> properties ) { + this.requestQueue.submit(new CreateNodeRequest(new Location(at), properties)); + return nextGraph; + } + + /** * Set the properties on a node. * * @param properties the properties to set @@ -1104,6 +1117,15 @@ }; } + /** + * Obtain the graph that this batch uses. + * + * @return the graph; never null + */ + public Graph getGraph() { + return Graph.this; + } + protected final void assertNotExecuted() { if (executed) { throw new IllegalStateException(GraphI18n.unableToAddMoreRequestsToAlreadyExecutedBatch.text()); @@ -1552,6 +1574,29 @@ * * * @param at the path to the node that is to be created. + * @param properties the iterator over the properties for the new node + * @return the object that can be used to specify addition properties for the new node to be copied or the location of the + * node where the node is to be created + */ + public Create<BatchConjunction> create( Path at, + Iterable<Property> properties ) { + assertNotExecuted(); + CreateAction<BatchConjunction> action = new CreateAction<BatchConjunction>(nextRequests, requestQueue, + new Location(at)); + for (Property property : properties) { + action.and(property); + } + return action; + } + + /** + * Begin the request to create a node located at the supplied path. + * + * Like all other methods on the {@link Batch}, the request will be performed when the {@link #execute()} method is + * called. + * + * + * @param at the path to the node that is to be created. * @param property a property for the new node * @return the object that can be used to specify addition properties for the new node to be copied or the location of the * node where the node is to be created Added: trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlHandler.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlHandler.java (rev 0) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlHandler.java 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,433 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.graph.xml; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.xml.parsers.SAXParser; +import net.jcip.annotations.NotThreadSafe; +import org.jboss.dna.common.text.TextDecoder; +import org.jboss.dna.common.text.XmlNameEncoder; +import org.jboss.dna.common.util.CheckArg; +import org.jboss.dna.graph.ExecutionContext; +import org.jboss.dna.graph.Graph; +import org.jboss.dna.graph.properties.Name; +import org.jboss.dna.graph.properties.NameFactory; +import org.jboss.dna.graph.properties.NamespaceRegistry; +import org.jboss.dna.graph.properties.Path; +import org.jboss.dna.graph.properties.PathFactory; +import org.jboss.dna.graph.properties.Property; +import org.jboss.dna.graph.properties.PropertyFactory; +import org.xml.sax.Attributes; +import org.xml.sax.ext.DefaultHandler2; + +/** + * A {@link DefaultHandler2} specialization that responds to XML content events by creating the corresponding content in the + * supplied graph. This implementation ignores DTD entities, XML contents, and other XML processing instructions. If other + * behavior is required, the appropriate methods can be overridden. (Which is why this class extends <code>DefaultHandler2</code>, + * which has support for processing all the different parts of XML. + * + * This class can be passed to the {@link SAXParser}'s {@link SAXParser#parse(java.io.File, org.xml.sax.helpers.DefaultHandler) + * parse(..,DefaultHandler)} methods. + * + * + * @author Randall Hauch + */ +@NotThreadSafe +public class XmlHandler extends DefaultHandler2 { + + /** + * The choices for how attributes that have no namespace prefix should be assigned a namespace. + * + * @author Randall Hauch + */ + public enum AttributeScoping { + /** The attribute's namespace is the default namespace */ + USE_DEFAULT_NAMESPACE, + /** The attribute's namespace is the same namespace as the containing element */ + INHERIT_ELEMENT_NAMESPACE; + } + + /** + * Decoder for XML names, to turn '_xHHHH_' sequences in the XML element and attribute names into the corresponding UTF-16 + * characters. + */ + public static TextDecoder DEFAULT_DECODER = new XmlNameEncoder(); + + /** + * The default {@link AttributeScoping}. + */ + public static AttributeScoping DEFAULT_ATTRIBUTE_SCOPING = AttributeScoping.USE_DEFAULT_NAMESPACE; + + /** + * The destination where the content should be sent. + */ + protected final Destination destination; + + /** + * The name of the XML attribute whose value should be used for the name of the node. For example, "jcr:name". + */ + protected final Name nameAttribute; + + /** + * The cached reference to the graph's path factory. + */ + protected final PathFactory pathFactory; + + /** + * The cached reference to the graph's name factory. + */ + protected final NameFactory nameFactory; + + /** + * The cached reference to the graph's property factory. + */ + protected final PropertyFactory propertyFactory; + + /** + * The cached reference to the graph's namespace registry. + */ + protected final NamespaceRegistry namespaceRegistry; + + /** + * The TextDecoder that is used to decode the names. + */ + protected final TextDecoder decoder; + + /** + * Local set of the namespace URIs that are registered. This is an optimization, rather than relying upon the (thread-safe) + * {@link #namespaceRegistry}. + */ + private final Set<String> namespaceUris = new HashSet<String>(); + + private final AttributeScoping attributeScoping; + + /** + * The path for the node representing the current element. This starts out as the path supplied by the constructor, and never + * is shorter than that initial path. + */ + protected Path currentPath; + + /** + * Flag the records whether the first element should be skipped. + */ + protected boolean skipFirstElement; + + /** + * A temporary list used to store the properties for a single node. This is cleared, populated, then used to create the node. + */ + protected final List<Property> properties = new ArrayList<Property>(); + + /** + * A working array that contains a single value object that is used to create Property objects (without having to create an + * array of values for each property). + */ + protected final Object[] propertyValues = new Object[1]; + + /** + * Create a handler that creates content in the supplied graph + * + * @param destination the destination where the content should be sent.graph in which the content should be placed + * @param skipRootElement true if the root element of the document should be skipped, or false if the root element should be + * converted to the top-level node of the content + * @param parent the path to the node in the graph under which the content should be placed; if null, the root node is assumed + * @param textDecoder the text decoder that should be used to decode the XML element names and XML attribute names, prior to + * using those values to create names; or null if the default encoder should be used + * @param nameAttribute the name of the XML attribute whose value should be used for the names of the nodes (typically, this + * is "jcr:name" or something equivalent); or null if the XML element name should always be used as the node name + * @param scoping defines how to choose the namespace of attributes that do not have a namespace prefix; if null, the + * {@link #DEFAULT_ATTRIBUTE_SCOPING} value is used + * @throws IllegalArgumentException if the destination reference is null + */ + public XmlHandler( Destination destination, + boolean skipRootElement, + Path parent, + TextDecoder textDecoder, + Name nameAttribute, + AttributeScoping scoping ) { + CheckArg.isNotNull(destination, "destination"); + assert destination != null; + this.destination = destination; + this.nameAttribute = nameAttribute; + this.decoder = textDecoder != null ? textDecoder : DEFAULT_DECODER; + this.skipFirstElement = skipRootElement; + this.attributeScoping = scoping != null ? scoping : DEFAULT_ATTRIBUTE_SCOPING; + + // Set up references to frequently-used objects in the context ... + final ExecutionContext context = destination.getExecutionContext(); + assert context != null; + this.nameFactory = context.getValueFactories().getNameFactory(); + this.pathFactory = context.getValueFactories().getPathFactory(); + this.propertyFactory = context.getPropertyFactory(); + this.namespaceRegistry = context.getNamespaceRegistry(); + assert this.nameFactory != null; + assert this.pathFactory != null; + assert this.propertyFactory != null; + assert this.namespaceRegistry != null; + + // Set up the initial path ... + this.currentPath = parent != null ? parent : this.pathFactory.createRootPath(); + assert this.currentPath != null; + } + + /** + * Create a handler that creates content in the supplied graph + * + * @param graph the graph in which the content should be placed + * @param useBatch true if all of the actions to create the content in the graph should be submitted to the graph in a single + * batch, or false if they should be submitted immediately after each is identified + * @param skipRootElement true if the root element of the document should be skipped, or false if the root element should be + * converted to the top-level node of the content + * @param parent the path to the node in the graph under which the content should be placed; if null, the root node is assumed + * @param textDecoder the text decoder that should be used to decode the XML element names and XML attribute names, prior to + * using those values to create names; or null if the default encoder should be used + * @param nameAttribute the name of the XML attribute whose value should be used for the names of the nodes (typically, this + * is "jcr:name" or something equivalent); or null if the XML element name should always be used as the node name + * @param scoping defines how to choose the namespace of attributes that do not have a namespace prefix; if null, the + * {@link #DEFAULT_ATTRIBUTE_SCOPING} value is used + * @throws IllegalArgumentException if the graph reference is null + */ + public XmlHandler( Graph graph, + boolean useBatch, + boolean skipRootElement, + Path parent, + TextDecoder textDecoder, + Name nameAttribute, + AttributeScoping scoping ) { + this(createDestination(graph, useBatch), skipRootElement, parent, textDecoder, nameAttribute, scoping); + } + + protected static Destination createDestination( Graph graph, + boolean useBatch ) { + CheckArg.isNotNull(graph, "graph"); + return useBatch ? new CreateOnGraphInBatches(graph.batch()) : new CreateOnGraph(graph); + } + + /** + * {@inheritDoc} + * + * This method ensures that the namespace is registered with the {@link NamespaceRegistry registry}, using the supplied prefix + * to register the namespace if required. Note that because this class does not really use the namespace prefixes to create + * {@link Name} objects, no attempt is made to match the XML namespace prefixes. + * + * + * @see org.xml.sax.helpers.DefaultHandler#startPrefixMapping(java.lang.String, java.lang.String) + */ + @Override + public void startPrefixMapping( String prefix, + String uri ) { + assert uri != null; + if (namespaceUris.add(uri)) { + // This is a new namespace for this document ... + if (!namespaceRegistry.isRegisteredNamespaceUri(uri)) { + if (prefix != null && prefix.length() == 0) prefix = null; + namespaceRegistry.register(prefix, uri); + } + } + } + + /** + * {@inheritDoc} + * + * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String, java.lang.String, java.lang.String, + * org.xml.sax.Attributes) + */ + @Override + public void startElement( String uri, + String localName, + String name, + Attributes attributes ) { + // Should this (root) element be skipped? + if (skipFirstElement) { + skipFirstElement = false; + return; + } + assert localName != null; + Name nodeName = null; + + properties.clear(); + // Convert each of the attributes to a property ... + for (int i = 0; i != attributes.getLength(); ++i) { + String attributeLocalName = attributes.getLocalName(i); + String attributeUri = attributes.getURI(i); + Name attributeName = null; + if ((attributeUri == null || attributeUri.length() == 0) && attributes.getQName(i).indexOf(':') == -1) { + switch (this.attributeScoping) { + case INHERIT_ELEMENT_NAMESPACE: + attributeName = nameFactory.create(uri, attributeLocalName, decoder); + break; + case USE_DEFAULT_NAMESPACE: + attributeName = nameFactory.create(attributeLocalName, decoder); + break; + } + } else { + attributeName = nameFactory.create(attributeUri, attributeLocalName, decoder); + } + assert attributeName != null; + // Check to see if this is an attribute that represents the node name (which may be null) ... + if (nodeName == null && attributeName.equals(nameAttribute)) { + nodeName = nameFactory.create(attributes.getValue(i)); // don't use a decoder + continue; + } + // Create a property for this attribute ... + Property property = createProperty(attributeName, attributes.getValue(i)); + properties.add(property); + } + // Create the node name if required ... + if (nodeName == null) nodeName = nameFactory.create(uri, localName, decoder); + // Update the current path ... + currentPath = pathFactory.create(currentPath, nodeName); + // Create the node, and note that we don't care about same-name siblings (as the graph will correct them) ... + destination.create(currentPath, properties); + } + + /** + * {@inheritDoc} + * + * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String, java.lang.String, java.lang.String) + */ + @Override + public void endElement( String uri, + String localName, + String name ) { + // Nothing to do but to change the current path to be the parent ... + currentPath = currentPath.getParent(); + } + + /** + * {@inheritDoc} + * + * @see org.xml.sax.helpers.DefaultHandler#endDocument() + */ + @Override + public void endDocument() { + // Submit any outstanding requests (if there are any) ... + destination.submit(); + } + + /** + * Create a property with the given name and value, obtained from an attribute name and value in the XML content. + * + * By default, this method creates a property by directly using the value as the sole String value of the property. + * + * + * @param propertyName the name of the property; never null + * @param value the attribute value + * @return the property; may not be null + */ + protected Property createProperty( Name propertyName, + String value ) { + propertyValues[0] = value; + return propertyFactory.create(propertyName, propertyValues); + } + + /** + * Interface used internally as the destination for the requests. This is used to abstract whether the requests should be + * submitted immediately or in a single batch. + * + * @author Randall Hauch + */ + @NotThreadSafe + public static interface Destination { + + /** + * Obtain the execution context of the destination. + * + * @return the destination's execution context + */ + public ExecutionContext getExecutionContext(); + + /** + * Create a node at the supplied path and with the supplied attributes. The path will be absolute. + * + * @param path the absolute path of the node + * @param properties the properties for the node; never null, but may be empty if there are no properties + */ + public void create( Path path, + List<Property> properties ); + + /** + * Signal to this destination that any enqueued create requests should be submitted. Usually this happens at the end of + * the document parsing, but an implementer must allow for it to be called multiple times and anytime during parsing. + */ + public void submit(); + } + + @NotThreadSafe + protected final static class CreateOnGraph implements Destination { + private final Graph graph; + + protected CreateOnGraph( final Graph graph ) { + assert graph != null; + this.graph = graph; + } + + public ExecutionContext getExecutionContext() { + return graph.getContext(); + } + + public final void create( Path path, + List<Property> properties ) { + assert properties != null; + if (properties.isEmpty()) { + graph.create(path); + } else { + graph.create(path, properties); + } + } + + public void submit() { + // Nothing to do, since each call to 'create' immediate executes on the graph + } + } + + @NotThreadSafe + protected final static class CreateOnGraphInBatches implements Destination { + private final Graph.Batch batch; + + protected CreateOnGraphInBatches( Graph.Batch batch ) { + assert batch != null; + this.batch = batch; + } + + public ExecutionContext getExecutionContext() { + return batch.getGraph().getContext(); + } + + public void create( Path path, + List<Property> properties ) { + assert properties != null; + if (properties.isEmpty()) { + batch.create(path); + } else { + batch.create(path, properties); + } + } + + public void submit() { + batch.execute(); + } + } + +} Property changes on: trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlHandlerTest.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlHandlerTest.java (rev 0) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlHandlerTest.java 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,371 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.graph.xml; + +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.hamcrest.core.IsNull.nullValue; +import static org.hamcrest.core.IsSame.sameInstance; +import static org.junit.Assert.assertThat; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import org.jboss.dna.common.text.Jsr283Encoder; +import org.jboss.dna.common.text.TextDecoder; +import org.jboss.dna.graph.ExecutionContext; +import org.jboss.dna.graph.Graph; +import org.jboss.dna.graph.Location; +import org.jboss.dna.graph.connectors.BasicExecutionContext; +import org.jboss.dna.graph.properties.Name; +import org.jboss.dna.graph.properties.NamespaceRegistry; +import org.jboss.dna.graph.properties.Path; +import org.jboss.dna.graph.properties.PathFactory; +import org.jboss.dna.graph.properties.Property; +import org.jboss.dna.graph.requests.CreateNodeRequest; +import org.junit.Before; +import org.junit.Test; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.XMLReaderFactory; + +/** + * @author Randall Hauch + */ +public class XmlHandlerTest { + + private static final String JCR_NAMESPACE_URI = "http://www.jcp.org/jcr/1.0"; + + private XmlHandler handler; + private ExecutionContext context; + private XmlHandler.Destination destination; + private boolean skipRootElement = false; + private Path parentPath; + private TextDecoder decoder; + private Name nameAttribute; + private XmlHandler.AttributeScoping scoping; + private LinkedList<CreateNodeRequest> requests; + + @Before + public void beforeEach() { + context = new BasicExecutionContext(); + context.getNamespaceRegistry().register("jcr", JCR_NAMESPACE_URI); + destination = new RecordingDestination(); + parentPath = context.getValueFactories().getPathFactory().create("/a/b"); + decoder = null; + nameAttribute = context.getValueFactories().getNameFactory().create("jcr:name"); + scoping = XmlHandler.AttributeScoping.USE_DEFAULT_NAMESPACE; + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + } + + @Test( expected = IllegalArgumentException.class ) + public void shouldNotConstructInstanceWhenGivenNullDestination() { + destination = null; + new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + } + + @Test( expected = IllegalArgumentException.class ) + public void shouldNotConstructInstanceWhenGivenNullGraph() { + Graph graph = null; + new XmlHandler(graph, true, skipRootElement, parentPath, decoder, nameAttribute, scoping); + } + + @Test + public void shouldUseDefaultDecoderIfNoneIsProvidedInConstructor() { + decoder = null; + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + assertThat(handler.destination, is(sameInstance(destination))); + assertThat(handler.currentPath, is(sameInstance(parentPath))); + assertThat(handler.skipFirstElement, is(skipRootElement)); + assertThat(handler.decoder, is(sameInstance(XmlHandler.DEFAULT_DECODER))); + assertThat(handler.nameAttribute, is(sameInstance(nameAttribute))); + } + + @Test + public void shouldUseDecoderProvidedInConstructor() { + decoder = new Jsr283Encoder(); + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + assertThat(handler.destination, is(sameInstance(destination))); + assertThat(handler.currentPath, is(sameInstance(parentPath))); + assertThat(handler.skipFirstElement, is(skipRootElement)); + assertThat(handler.decoder, is(sameInstance(decoder))); + assertThat(handler.nameAttribute, is(sameInstance(nameAttribute))); + } + + @Test + public void shouldPlaceContentUnderRootIfNoPathIsProvidedInConstructor() { + parentPath = null; + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + assertThat(handler.destination, is(sameInstance(destination))); + assertThat(handler.currentPath.isRoot(), is(true)); + assertThat(handler.skipFirstElement, is(skipRootElement)); + assertThat(handler.decoder, is(sameInstance(decoder != null ? decoder : XmlHandler.DEFAULT_DECODER))); + assertThat(handler.nameAttribute, is(sameInstance(nameAttribute))); + } + + @Test + public void shouldNotLookForNameAttributeIfNoneIsProvidedInConstructor() { + nameAttribute = null; + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + assertThat(handler.destination, is(sameInstance(destination))); + assertThat(handler.currentPath, is(sameInstance(parentPath))); + assertThat(handler.skipFirstElement, is(skipRootElement)); + assertThat(handler.decoder, is(sameInstance(decoder != null ? decoder : XmlHandler.DEFAULT_DECODER))); + assertThat(handler.nameAttribute, is(nullValue())); + } + + @Test + public void shouldParseXmlDocumentWithoutNamespaces() throws IOException, SAXException { + parse("xmlHandler/docWithoutNamespaces.xml"); + // Check the generated content; note that the attribute name doesn't match, so the nodes don't get special names + assertNode("Cars"); + assertNode("Cars/Hybrid"); + assertNode("Cars/Hybrid/car", "name=Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("Cars/Hybrid/car", "name=Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("Cars/Hybrid/car", "name=Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("Cars/Sports"); + assertNode("Cars/Sports/car", "name=Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("Cars/Sports/car", "name=Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentWithNamespaces() throws IOException, SAXException { + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parse("xmlHandler/docWithNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("c:Cars"); + assertNode("c:Cars/c:Hybrid"); + assertNode("c:Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Cars/c:Sports"); + assertNode("c:Cars/c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Cars/c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentWithNestedNamespaceDeclarations() throws IOException, SAXException { + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + context.getNamespaceRegistry().register("i", "http://attributes.com"); + parse("xmlHandler/docWithNestedNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("Cars"); + assertNode("Cars/c:Hybrid"); + assertNode("Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("Cars/Sports"); + assertNode("Cars/Sports/Aston Martin DB9", "i:maker=Aston Martin", "model=DB9"); + assertNode("Cars/Sports/Infiniti G37", "i:maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentWithNamespacePrefixesThatDoNotMatchRegistry() throws IOException, SAXException { + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parse("xmlHandler/docWithNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("c:Cars"); + assertNode("c:Cars/c:Hybrid"); + assertNode("c:Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Cars/c:Sports"); + assertNode("c:Cars/c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Cars/c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentWithNamespacesThatAreNotYetInRegistry() throws IOException, SAXException { + NamespaceRegistry reg = context.getNamespaceRegistry(); + reg.unregister(JCR_NAMESPACE_URI); + // Verify the prefixes don't exist ... + assertThat(reg.getPrefixForNamespaceUri(JCR_NAMESPACE_URI, false), is(nullValue())); + assertThat(reg.getPrefixForNamespaceUri("http://default.namespace.com", false), is(nullValue())); + // Parse the XML file ... + parse("xmlHandler/docWithNestedNamespaces.xml"); + // Get the prefix for the default namespace ... + String c = reg.getPrefixForNamespaceUri("http://default.namespace.com", false); + String i = reg.getPrefixForNamespaceUri("http://attributes.com", false); + String d = reg.getPrefixForNamespaceUri(reg.getDefaultNamespaceUri(), false); + if (c.length() != 0) c = c + ":"; + if (d.length() != 0) d = d + ":"; + if (i.length() != 0) i = i + ":"; + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode(d + "Cars"); + assertNode(d + "Cars/" + c + "Hybrid"); + assertNode(d + "Cars/" + c + "Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode(d + "Cars/" + c + "Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode(d + "Cars/" + c + "Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode(d + "Cars/" + d + "Sports"); + assertNode(d + "Cars/" + d + "Sports/Aston Martin DB9", i + "maker=Aston Martin", "model=DB9"); + assertNode(d + "Cars/" + d + "Sports/Infiniti G37", i + "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentThatUsesNameAttribute() throws IOException, SAXException { + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parse("xmlHandler/docWithNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("c:Cars"); + assertNode("c:Cars/c:Hybrid"); + assertNode("c:Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Cars/c:Sports"); + assertNode("c:Cars/c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Cars/c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentThatContainsNoContent() throws IOException, SAXException { + parse("xmlHandler/docWithOnlyRootElement.xml"); + assertNode("Cars"); + } + + @Test + public void shouldParseXmlDocumentAndShouldNotCreateNodeForRootElement() throws IOException, SAXException { + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parentPath = null; + skipRootElement = true; + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + parse("xmlHandler/docWithNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("c:Hybrid"); + assertNode("c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Sports"); + assertNode("c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentAndShouldPlaceContentUnderNonRootNode() throws IOException, SAXException { + parentPath = context.getValueFactories().getPathFactory().create("/a/b"); + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parse("xmlHandler/docWithNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("c:Cars"); + assertNode("c:Cars/c:Hybrid"); + assertNode("c:Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Cars/c:Sports"); + assertNode("c:Cars/c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Cars/c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentAndShouldPlaceContentUnderRootNode() throws IOException, SAXException { + parentPath = null; + handler = new XmlHandler(destination, skipRootElement, parentPath, decoder, nameAttribute, scoping); + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parse("xmlHandler/docWithNamespaces.xml"); + // Check the generated content; note that the attribute name DOES match, so the nodes names come from "jcr:name" attribute + assertNode("c:Cars"); + assertNode("c:Cars/c:Hybrid"); + assertNode("c:Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Cars/c:Sports"); + assertNode("c:Cars/c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Cars/c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + @Test + public void shouldParseXmlDocumentWithXmlComments() throws IOException, SAXException { + context.getNamespaceRegistry().register("c", "http://default.namespace.com"); + parse("xmlHandler/docWithComments.xml"); + assertNode("c:Cars"); + assertNode("c:Cars/c:Hybrid"); + assertNode("c:Cars/c:Hybrid/Toyota Prius", "maker=Toyota", "model=Prius"); + assertNode("c:Cars/c:Hybrid/Toyota Highlander", "maker=Toyota", "model=Highlander"); + assertNode("c:Cars/c:Hybrid/Nissan Altima", "maker=Nissan", "model=Altima"); + assertNode("c:Cars/c:Sports"); + assertNode("c:Cars/c:Sports/Aston Martin DB9", "maker=Aston Martin", "model=DB9"); + assertNode("c:Cars/c:Sports/Infiniti G37", "maker=Infiniti", "model=G37"); + } + + protected void assertNode( String path, + String... properties ) { + // Create the expected path ... + PathFactory factory = context.getValueFactories().getPathFactory(); + Path expectedPath = parentPath != null ? factory.create(parentPath, path) : factory.create("/" + path); + // Create the list of properties ... + Map<Name, Property> expectedProperties = new HashMap<Name, Property>(); + for (String propertyString : properties) { + String[] strings = propertyString.split("="); + if (strings.length < 2) continue; + Name name = context.getValueFactories().getNameFactory().create(strings[0]); + Object[] values = new Object[strings.length - 1]; + for (int i = 1; i != strings.length; ++i) { + values[i - 1] = strings[i]; + } + Property property = context.getPropertyFactory().create(name, values); + expectedProperties.put(name, property); + } + // Now get the next request and compare the expected and actual ... + CreateNodeRequest request = requests.remove(); + assertThat(request.at().getPath(), is(expectedPath)); + for (Property actual : request.properties()) { + Property expected = expectedProperties.remove(actual.getName()); + assertThat(expected, is(notNullValue())); + assertThat(actual, is(expected)); + } + assertThat(expectedProperties.isEmpty(), is(true)); + } + + protected void parse( String relativePathToXmlFile ) throws IOException, SAXException { + InputStream stream = getClass().getClassLoader().getResourceAsStream(relativePathToXmlFile); + try { + XMLReader reader = XMLReaderFactory.createXMLReader(); + reader.setContentHandler(handler); + reader.setErrorHandler(handler); + reader.parse(new InputSource(stream)); + } finally { + if (stream != null) stream.close(); + } + } + + protected class RecordingDestination implements XmlHandler.Destination { + private final LinkedList<CreateNodeRequest> requests = new LinkedList<CreateNodeRequest>(); + + public void create( Path path, + List<Property> properties ) { + requests.add(new CreateNodeRequest(new Location(path), properties)); + } + + @SuppressWarnings( "synthetic-access" ) + public ExecutionContext getExecutionContext() { + return XmlHandlerTest.this.context; + } + + @SuppressWarnings( "synthetic-access" ) + public void submit() { + XmlHandlerTest.this.requests = requests; + } + } +} Property changes on: trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlHandlerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-graph/src/test/resources/xmlHandler/docWithComments.xml =================================================================== --- trunk/dna-graph/src/test/resources/xmlHandler/docWithComments.xml (rev 0) +++ trunk/dna-graph/src/test/resources/xmlHandler/docWithComments.xml 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Cars xmlns="http://default.namespace.com" xmlns:jcr="http://www.jcp.org/jcr/1.0"> +  + <Hybrid> + <car jcr:name="Toyota Prius" maker="Toyota" model="Prius"/> + <car jcr:name="Toyota Highlander" maker="Toyota" model="Highlander"/> + <car jcr:name="Nissan Altima" maker="Nissan" model="Altima"/> + </Hybrid> +  + <Sports> + <car jcr:name="Aston Martin DB9" maker="Aston Martin" model="DB9"/> + <car jcr:name="Infiniti G37" maker="Infiniti" model="G37" /> + </Sports> +</Cars> \ No newline at end of file Property changes on: trunk/dna-graph/src/test/resources/xmlHandler/docWithComments.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-graph/src/test/resources/xmlHandler/docWithNamespaces.xml =================================================================== --- trunk/dna-graph/src/test/resources/xmlHandler/docWithNamespaces.xml (rev 0) +++ trunk/dna-graph/src/test/resources/xmlHandler/docWithNamespaces.xml 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Cars xmlns="http://default.namespace.com" xmlns:jcr="http://www.jcp.org/jcr/1.0"> + <Hybrid> + <car jcr:name="Toyota Prius" maker="Toyota" model="Prius"/> + <car jcr:name="Toyota Highlander" maker="Toyota" model="Highlander"/> + <car jcr:name="Nissan Altima" maker="Nissan" model="Altima"/> + </Hybrid> + <Sports> + <car jcr:name="Aston Martin DB9" maker="Aston Martin" model="DB9"/> + <car jcr:name="Infiniti G37" maker="Infiniti" model="G37" /> + </Sports> +</Cars> \ No newline at end of file Property changes on: trunk/dna-graph/src/test/resources/xmlHandler/docWithNamespaces.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-graph/src/test/resources/xmlHandler/docWithNestedNamespaces.xml =================================================================== --- trunk/dna-graph/src/test/resources/xmlHandler/docWithNestedNamespaces.xml (rev 0) +++ trunk/dna-graph/src/test/resources/xmlHandler/docWithNestedNamespaces.xml 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Cars xmlns:jcr="http://www.jcp.org/jcr/1.0"> + <Hybrid xmlns="http://default.namespace.com"> + <car jcr:name="Toyota Prius" maker="Toyota" model="Prius"/> + <car jcr:name="Toyota Highlander" maker="Toyota" model="Highlander"/> + <car jcr:name="Nissan Altima" maker="Nissan" model="Altima"/> + </Hybrid> + <Sports xmlns:jcr2="http://www.jcp.org/jcr/1.0" xmlns:info="http://attributes.com"> + <car jcr2:name="Aston Martin DB9" info:maker="Aston Martin" model="DB9"/> + <car jcr:name="Infiniti G37" info:maker="Infiniti" model="G37" /> + </Sports> +</Cars> \ No newline at end of file Property changes on: trunk/dna-graph/src/test/resources/xmlHandler/docWithNestedNamespaces.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-graph/src/test/resources/xmlHandler/docWithOnlyRootElement.xml =================================================================== --- trunk/dna-graph/src/test/resources/xmlHandler/docWithOnlyRootElement.xml (rev 0) +++ trunk/dna-graph/src/test/resources/xmlHandler/docWithOnlyRootElement.xml 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,3 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Cars> +</Cars> \ No newline at end of file Property changes on: trunk/dna-graph/src/test/resources/xmlHandler/docWithOnlyRootElement.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/dna-graph/src/test/resources/xmlHandler/docWithoutNamespaces.xml =================================================================== --- trunk/dna-graph/src/test/resources/xmlHandler/docWithoutNamespaces.xml (rev 0) +++ trunk/dna-graph/src/test/resources/xmlHandler/docWithoutNamespaces.xml 2008-10-28 03:01:03 UTC (rev 590) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Cars> + <Hybrid> + <car name="Toyota Prius" maker="Toyota" model="Prius"/> + <car name="Toyota Highlander" maker="Toyota" model="Highlander"/> + <car name="Nissan Altima" maker="Nissan" model="Altima"/> + </Hybrid> + <Sports> + <car name="Aston Martin DB9" maker="Aston Martin" model="DB9"/> + <car name="Infiniti G37" maker="Infiniti" model="G37" /> + </Sports> +</Cars> \ No newline at end of file Property changes on: trunk/dna-graph/src/test/resources/xmlHandler/docWithoutNamespaces.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 6 months

1
0
0 / 0

DNA SVN: r589 - in trunk: dna-graph/src/main/java/org/jboss/dna/graph/properties/basic and 1 other directories.

by dna-commits＠lists.jboss.org

Author: rhauch Date: 2008-10-27 23:00:46 -0400 (Mon, 27 Oct 2008) New Revision: 589 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/NamespaceRegistry.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/basic/BasicNamespaceRegistry.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/JcrNamespaceRegistry.java Log: DNA-230 - Enhance NamespaceRegistry with additional functionality http://jira.jboss.com/jira/browse/DNA-230 Added an "unregister" method to the interface and implementations. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/NamespaceRegistry.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/NamespaceRegistry.java 2008-10-27 19:25:17 UTC (rev 588) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/NamespaceRegistry.java 2008-10-28 03:00:46 UTC (rev 589) @@ -85,6 +85,16 @@ String namespaceUri ); /** + * Unregister the namespace with the supplied URI. + * + * @param namespaceUri the namespace URI + * @return true if the namespace was removed, or false if the namespace was not registered + * @throws IllegalArgumentException if the namespace URI is null + * @throws NamespaceException if there is a problem unregistering the namespace + */ + boolean unregister( String namespaceUri ); + + /** * Obtain the set of namespaces that are registered. * * @return the set of Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/basic/BasicNamespaceRegistry.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/basic/BasicNamespaceRegistry.java 2008-10-27 19:25:17 UTC (rev 588) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/properties/basic/BasicNamespaceRegistry.java 2008-10-28 03:00:46 UTC (rev 589) @@ -180,6 +180,8 @@ lock.lock(); if (prefix == null) prefix = generatePrefix(); prefix = prefix.trim(); + prefix = prefix.replaceFirst("^:+", ""); + prefix = prefix.replaceFirst(":+$", ""); previousNamespaceForPrefix = this.namespacesByPrefix.put(prefix, namespaceUri); String previousPrefix = this.prefixesByNamespace.put(namespaceUri, prefix); if (previousPrefix != null && !previousPrefix.equals(prefix)) { @@ -196,7 +198,27 @@ /** * {@inheritDoc} + * + * @see org.jboss.dna.graph.properties.NamespaceRegistry#unregister(java.lang.String) */ + public boolean unregister( String namespaceUri ) { + CheckArg.isNotNull(namespaceUri, "namespaceUri"); + namespaceUri = namespaceUri.trim(); + Lock lock = this.registryLock.writeLock(); + try { + lock.lock(); + String prefix = this.prefixesByNamespace.remove(namespaceUri); + if (prefix == null) return false; + this.namespacesByPrefix.remove(prefix); + } finally { + lock.unlock(); + } + return true; + } + + /** + * {@inheritDoc} + */ public Set<String> getRegisteredNamespaceUris() { Set<String> result = new HashSet<String>(); Lock lock = this.registryLock.readLock(); Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/JcrNamespaceRegistry.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/JcrNamespaceRegistry.java 2008-10-27 19:25:17 UTC (rev 588) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/JcrNamespaceRegistry.java 2008-10-28 03:00:46 UTC (rev 589) @@ -143,7 +143,31 @@ /** * {@inheritDoc} + * + * @see org.jboss.dna.graph.properties.NamespaceRegistry#unregister(java.lang.String) */ + public boolean unregister( String namespaceUri ) { + Session session = null; + try { + session = this.sessionFactory.createSession(this.repositoryWorkspaceName); + String prefix = session.getNamespacePrefix(namespaceUri); + javax.jcr.NamespaceRegistry registry = session.getWorkspace().getNamespaceRegistry(); + registry.unregisterNamespace(prefix); + } catch (javax.jcr.NamespaceException e) { + return false; + } catch (RepositoryException e) { + throw new NamespaceException(e); + } finally { + if (session != null) { + session.logout(); + } + } + return true; + } + + /** + * {@inheritDoc} + */ public Set<String> getRegisteredNamespaceUris() { Session session = null; try {

15 years, 6 months

1
0
0 / 0

DNA SVN: r587 - in trunk: dna-graph/src/main/java/org/jboss/dna/graph/connectors and 4 other directories.

by dna-commits＠lists.jboss.org

Author: jverhaeg(a)redhat.com Date: 2008-10-24 18:13:16 -0400 (Fri, 24 Oct 2008) New Revision: 587 Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java Log: DNA_241: Made a thread-safe progress monitor accessible from execution contexts. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContext.java 2008-10-24 22:13:16 UTC (rev 587) @@ -25,6 +25,7 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import org.jboss.dna.common.component.ClassLoaderFactory; +import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.properties.NamespaceRegistry; import org.jboss.dna.graph.properties.Property; @@ -49,57 +50,64 @@ AccessControlContext getAccessControlContext(); /** - * @return the login context; may be <code>null</code> + * Return a logger associated with this context. This logger records only those activities within the context and provide a + * way to capture the context-specific activities. All log messages are also sent to the system logger, so classes that log + * via this mechanism should not also {@link Logger#getLogger(Class) obtain a system logger}. + * + * @param clazz the class that is doing the logging + * @return the logger, named after <code>clazz</code>; never null + * @see #getLogger(String) */ - LoginContext getLoginContext(); + Logger getLogger( Class<?> clazz ); /** - * Get the factories that should be used to create values for {@link Property properties}. + * Return a logger associated with this context. This logger records only those activities within the context and provide a + * way to capture the context-specific activities. All log messages are also sent to the system logger, so classes that log + * via this mechanism should not also {@link Logger#getLogger(Class) obtain a system logger}. * - * @return the property value factory; never null + * @param name the name for the logger + * @return the logger, named after <code>clazz</code>; never null + * @see #getLogger(Class) */ - ValueFactories getValueFactories(); + Logger getLogger( String name ); /** + * @return the login context; may be <code>null</code> + */ + LoginContext getLoginContext(); + + /** * Get the namespace registry for this context. * - * @return the namespace registry; never null + * @return the namespace registry; never <code>null</code> */ NamespaceRegistry getNamespaceRegistry(); /** + * Returns the thread-safe progress monitor associated with this execution context. + * + * @return the progress monitor; never <code>null</code>; + */ + ProgressMonitor getProgressMonitor(); + + /** * Get the factory for creating {@link Property} objects. * - * @return the property factory; never null + * @return the property factory; never <code>null</code> */ PropertyFactory getPropertyFactory(); /** * Get the JAAS subject for which this context was created. * - * @return the subject; never null + * @return the subject; never <code>null</code> */ Subject getSubject(); /** - * Return a logger associated with this context. This logger records only those activities within the context and provide a - * way to capture the context-specific activities. All log messages are also sent to the system logger, so classes that log - * via this mechanism should not also {@link Logger#getLogger(Class) obtain a system logger}. + * Get the factories that should be used to create values for {@link Property properties}. * - * @param clazz the class that is doing the logging - * @return the logger, named after <code>clazz</code>; never null - * @see #getLogger(String) + * @return the property value factory; never null */ - Logger getLogger( Class<?> clazz ); - - /** - * Return a logger associated with this context. This logger records only those activities within the context and provide a - * way to capture the context-specific activities. All log messages are also sent to the system logger, so classes that log - * via this mechanism should not also {@link Logger#getLogger(Class) obtain a system logger}. - * - * @param name the name for the logger - * @return the logger, named after <code>clazz</code>; never null - * @see #getLogger(Class) - */ - Logger getLogger( String name ); + ValueFactories getValueFactories(); } Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/ExecutionContexts.java 2008-10-24 22:13:16 UTC (rev 587) @@ -24,6 +24,7 @@ import java.security.AccessControlContext; import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; +import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.properties.NameFactory; @@ -187,6 +188,15 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#getProgressMonitor() + */ + public ProgressMonitor getProgressMonitor() { + return delegate.getProgressMonitor(); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/connectors/BasicExecutionContext.java 2008-10-24 22:13:16 UTC (rev 587) @@ -27,7 +27,8 @@ import javax.security.auth.login.LoginContext; import org.jboss.dna.common.component.ClassLoaderFactory; import org.jboss.dna.common.component.StandardClassLoaderFactory; -import org.jboss.dna.common.util.CheckArg; +import org.jboss.dna.common.monitor.ProgressMonitor; +import org.jboss.dna.common.monitor.SimpleProgressMonitor; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.ExecutionContext; import org.jboss.dna.graph.properties.NamespaceRegistry; @@ -50,59 +51,52 @@ private final PropertyFactory propertyFactory; private final ValueFactories valueFactories; private final NamespaceRegistry namespaceRegistry; + private final ProgressMonitor progressMonitor; public BasicExecutionContext() { - this(new BasicNamespaceRegistry()); + this(null, null, null, null, null, null); } - public BasicExecutionContext( NamespaceRegistry namespaceRegistry ) { - this(namespaceRegistry, null, null); - } - public BasicExecutionContext( LoginContext loginContext ) { - this(loginContext, new BasicNamespaceRegistry()); + this(loginContext, null, null, null, null, null); } public BasicExecutionContext( AccessControlContext accessControlContext ) { - this(accessControlContext, new BasicNamespaceRegistry()); + this(null, accessControlContext, null, null, null, null); } - public BasicExecutionContext( LoginContext loginContext, - NamespaceRegistry namespaceRegistry ) { - this(loginContext, namespaceRegistry, null, null); - } - - public BasicExecutionContext( AccessControlContext accessControlContext, - NamespaceRegistry namespaceRegistry ) { - this(accessControlContext, namespaceRegistry, null, null); - } - public BasicExecutionContext( NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory ) { - this(null, null, namespaceRegistry, valueFactories, propertyFactory); + PropertyFactory propertyFactory, + ProgressMonitor progressMonitor ) { + this(null, null, namespaceRegistry, valueFactories, propertyFactory, progressMonitor); } public BasicExecutionContext( LoginContext loginContext, NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory ) { - this(loginContext, null, namespaceRegistry, valueFactories, propertyFactory); + PropertyFactory propertyFactory, + ProgressMonitor progressMonitor ) { + this(loginContext, null, namespaceRegistry, valueFactories, propertyFactory, progressMonitor); } public BasicExecutionContext( AccessControlContext accessControlContext, NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory ) { - this(null, accessControlContext, namespaceRegistry, valueFactories, propertyFactory); + PropertyFactory propertyFactory, + ProgressMonitor progressMonitor ) { + this(null, accessControlContext, namespaceRegistry, valueFactories, propertyFactory, progressMonitor); } + /* + * This constructor exists to deal with mutually-exclusive parameters, such as LoginContext and AccessControlContext. + */ private BasicExecutionContext( LoginContext loginContext, AccessControlContext accessControlContext, NamespaceRegistry namespaceRegistry, ValueFactories valueFactories, - PropertyFactory propertyFactory ) { - CheckArg.isNotNull(namespaceRegistry, "namespaceRegistry"); + PropertyFactory propertyFactory, + ProgressMonitor progressMonitor ) { this.loginContext = loginContext; this.accessControlContext = accessControlContext; if (loginContext == null) { @@ -110,9 +104,10 @@ } else { this.subject = loginContext.getSubject(); } - this.namespaceRegistry = namespaceRegistry; - this.valueFactories = valueFactories != null ? valueFactories : new StandardValueFactories(this.namespaceRegistry); - this.propertyFactory = propertyFactory != null ? propertyFactory : new BasicPropertyFactory(this.valueFactories); + this.namespaceRegistry = namespaceRegistry == null ? new BasicNamespaceRegistry() : namespaceRegistry; + this.valueFactories = valueFactories == null ? new StandardValueFactories(this.namespaceRegistry) : valueFactories; + this.propertyFactory = propertyFactory == null ? new BasicPropertyFactory(this.valueFactories) : propertyFactory; + this.progressMonitor = progressMonitor == null ? new SimpleProgressMonitor(null) : progressMonitor; this.classLoaderFactory = new StandardClassLoaderFactory(); } @@ -152,7 +147,16 @@ /** * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getProgressMonitor() */ + public ProgressMonitor getProgressMonitor() { + return progressMonitor; + } + + /** + * {@inheritDoc} + */ public PropertyFactory getPropertyFactory() { return propertyFactory; } Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java 2008-10-24 22:13:16 UTC (rev 587) @@ -404,6 +404,15 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#getProgressMonitor() + */ + public ProgressMonitor getProgressMonitor() { + return getContext().getProgressMonitor(); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java 2008-10-24 22:13:16 UTC (rev 587) @@ -26,6 +26,7 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import net.jcip.annotations.Immutable; +import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.DnaLexicon; import org.jboss.dna.graph.properties.Name; @@ -149,6 +150,15 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#getProgressMonitor() + */ + public ProgressMonitor getProgressMonitor() { + return null; + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java 2008-10-24 22:13:16 UTC (rev 587) @@ -35,6 +35,7 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import net.jcip.annotations.Immutable; +import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.common.util.Logger; import org.jboss.dna.graph.properties.Name; @@ -263,6 +264,15 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#getProgressMonitor() + */ + public ProgressMonitor getProgressMonitor() { + return context.getProgressMonitor(); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ public PropertyFactory getPropertyFactory() { Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencingService.java 2008-10-24 22:13:16 UTC (rev 587) @@ -72,6 +72,7 @@ * content to extract or to generate structured information. * * @author Randall Hauch + * @author John Verhaeg */ public class SequencingService implements AdministeredService, NodeChangeListener { @@ -640,7 +641,16 @@ /** * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getProgressMonitor() */ + public ProgressMonitor getProgressMonitor() { + return delegate.getProgressMonitor(); + } + + /** + * {@inheritDoc} + */ public PropertyFactory getPropertyFactory() { return this.delegate.getPropertyFactory(); } Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java 2008-10-24 21:38:30 UTC (rev 586) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/util/BasicJcrExecutionContext.java 2008-10-24 22:13:16 UTC (rev 587) @@ -29,6 +29,7 @@ /** * @author Randall Hauch + * @author John Verhaeg */ public class BasicJcrExecutionContext extends BasicExecutionContext implements JcrExecutionContext { @@ -36,20 +37,20 @@ private final SessionFactory sessionFactory; public BasicJcrExecutionContext( SessionFactory sessionFactory, - String repositoryWorkspaceForNamespaceRegistry ) { + String repositoryWorkspaceForNamespaceRegistry ) { this(sessionFactory, new JcrNamespaceRegistry(sessionFactory, repositoryWorkspaceForNamespaceRegistry), null, null); } public BasicJcrExecutionContext( SessionFactory sessionFactory, - NamespaceRegistry namespaceRegistry ) { + NamespaceRegistry namespaceRegistry ) { this(sessionFactory, namespaceRegistry, null, null); } public BasicJcrExecutionContext( SessionFactory sessionFactory, - NamespaceRegistry namespaceRegistry, - ValueFactories valueFactories, - PropertyFactory propertyFactory ) { - super(namespaceRegistry, valueFactories, propertyFactory); + NamespaceRegistry namespaceRegistry, + ValueFactories valueFactories, + PropertyFactory propertyFactory ) { + super(namespaceRegistry, valueFactories, propertyFactory, null); CheckArg.isNotNull(sessionFactory, "session factory"); this.sessionFactory = sessionFactory; }

15 years, 6 months

1
0
0 / 0

DNA SVN: r586 - trunk/dna-common/src/main/java/org/jboss/dna/common/monitor.

by dna-commits＠lists.jboss.org

Author: jverhaeg(a)redhat.com Date: 2008-10-24 17:38:30 -0400 (Fri, 24 Oct 2008) New Revision: 586 Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java Log: Changed SimpleProgressMonitor to be thread-safe by making it use thread-safe problems internally, added a thread-safe annotation, and update the JavaDocs accordingly. Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java 2008-10-24 21:07:56 UTC (rev 585) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java 2008-10-24 21:38:30 UTC (rev 586) @@ -27,21 +27,18 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import net.jcip.annotations.GuardedBy; +import net.jcip.annotations.ThreadSafe; import org.jboss.dna.common.collection.Problems; -import org.jboss.dna.common.collection.SimpleProblems; +import org.jboss.dna.common.collection.ThreadSafeProblems; import org.jboss.dna.common.i18n.I18n; /** * A basic progress monitor. - * - * This class is thread-safe except when accessing or adding {@link #getProblems() problems}. Problems must only be added by the - * {@link ProgressMonitor Updater}, and accessed by {@link ProgressMonitor Observers} only after the activity - * has been {@link #done() completed}. - * * * @author Randall Hauch * @author John Verhaeg */ +@ThreadSafe public class SimpleProgressMonitor implements ProgressMonitor { @GuardedBy( "lock" ) @@ -56,7 +53,7 @@ private final String activityName; private final ReadWriteLock lock = new ReentrantReadWriteLock(); private final AtomicBoolean cancelled = new AtomicBoolean(false); - private final Problems problems = new SimpleProblems(); + private final Problems problems = new ThreadSafeProblems(); public SimpleProgressMonitor( String activityName ) { this.activityName = activityName != null ? activityName.trim() : "";

15 years, 6 months

1
0
0 / 0

DNA SVN: r585 - trunk/docs/examples/gettingstarted/repositories/src/main/java/org/jboss/example/dna/repository.

by dna-commits＠lists.jboss.org

Author: rhauch Date: 2008-10-24 17:07:56 -0400 (Fri, 24 Oct 2008) New Revision: 585 Modified: trunk/docs/examples/gettingstarted/repositories/src/main/java/org/jboss/example/dna/repository/RepositoryClient.java Log: Removed catch block used for debugging but accidentally left in during previous commit. Modified: trunk/docs/examples/gettingstarted/repositories/src/main/java/org/jboss/example/dna/repository/RepositoryClient.java =================================================================== --- trunk/docs/examples/gettingstarted/repositories/src/main/java/org/jboss/example/dna/repository/RepositoryClient.java 2008-10-24 21:07:02 UTC (rev 584) +++ trunk/docs/examples/gettingstarted/repositories/src/main/java/org/jboss/example/dna/repository/RepositoryClient.java 2008-10-24 21:07:56 UTC (rev 585) @@ -293,8 +293,6 @@ } } catch (javax.jcr.PathNotFoundException e) { return false; - } catch (Throwable t) { - t.printStackTrace(); } finally { if (session != null) session.logout(); }

15 years, 6 months

1
0
0 / 0

DNA SVN: r582 - trunk.

by dna-commits＠lists.jboss.org

Author: rhauch Date: 2008-10-24 14:34:37 -0400 (Fri, 24 Oct 2008) New Revision: 582 Modified: trunk/pom.xml Log: Added Sergiy Litsenko as a contributor Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2008-10-24 18:08:17 UTC (rev 581) +++ trunk/pom.xml 2008-10-24 18:34:37 UTC (rev 582) @@ -94,13 +94,13 @@ <timezone>-3</timezone> </developer> <developer> - <name>Ben Abernathy</name> - <id>babernat</id> - <email>ben.abernathy(a)gmail.com</email> + <name>Sergiy Litsenko</name> + <id>lisbor</id> + <email>litsenko_sergey(a)yahoo.com</email> <roles> <role>Developer</role> </roles> - <timezone>+2</timezone> + <timezone>0</timezone> </developer> </developers> <contributors>

15 years, 6 months

1
0
0 / 0

DNA SVN: r581 - in trunk: dna-graph/src/main/java/org/jboss/dna/graph/util and 9 other directories.

by dna-commits＠lists.jboss.org

Author: jverhaeg(a)redhat.com Date: 2008-10-24 14:08:17 -0400 (Fri, 24 Oct 2008) New Revision: 581 Added: trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerContext.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerOutput.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlSequencer.java trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerOutput.java trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlSequencerTest.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerOutputMap.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/SequencerNodeContextTest.java trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/StreamSequencerAdapterTest.java trunk/extensions/dna-sequencer-images/src/main/java/org/jboss/dna/sequencer/images/ImageMetadataSequencer.java trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java Log: DNA-185: Modified SequencerContext and all implementation to extend ExecutionContext. Also removed related deprecated getNamespaceRegistry() and getFactories() methods in SequencerOutput. Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerContext.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerContext.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerContext.java 2008-10-24 18:08:17 UTC (rev 581) @@ -22,26 +22,17 @@ package org.jboss.dna.graph.sequencers; import java.util.Set; -import org.jboss.dna.common.util.Logger; +import org.jboss.dna.graph.ExecutionContext; import org.jboss.dna.graph.properties.Name; -import org.jboss.dna.graph.properties.NamespaceRegistry; import org.jboss.dna.graph.properties.Path; import org.jboss.dna.graph.properties.Property; -import org.jboss.dna.graph.properties.ValueFactories; /** * @author John Verhaeg */ -public interface SequencerContext { +public interface SequencerContext extends ExecutionContext { /** - * Get the factories that can be used to create {@link Path paths} and other property values. - * - * @return the collection of factories; never <code>null</code>. - */ - ValueFactories getFactories(); - - /** * Return the path of the input node containing the content being sequenced. * * @return input node's path. @@ -69,34 +60,4 @@ * @return the MIME-type */ String getMimeType(); - - /** - * Convenience method to get the namespace registry used by the {@link ValueFactories#getNameFactory() name value factory}. - * - * @return the namespace registry; never <code>null</code>. - */ - NamespaceRegistry getNamespaceRegistry(); - - /** - * Return a logger associated with this context. This logger records only those activities within the context and provide a - * way to capture the context-specific activities. All log messages are also sent to the system logger, so classes that log - * via this mechanism should not also {@link Logger#getLogger(Class) obtain a system logger}. - * - * @param clazz the class that is doing the logging - * @return the logger, named after <code>clazz</code>; never null - * @see #getLogger(String) - */ - Logger getLogger( Class<?> clazz ); - - /** - * Return a logger associated with this context. This logger records only those activities within the context and provide a - * way to capture the context-specific activities. All log messages are also sent to the system logger, so classes that log - * via this mechanism should not also {@link Logger#getLogger(Class) obtain a system logger}. - * - * @param name the name for the logger - * @return the logger, named after <code>clazz</code>; never null - * @see #getLogger(Class) - */ - Logger getLogger( String name ); - } Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerOutput.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerOutput.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/sequencers/SequencerOutput.java 2008-10-24 18:08:17 UTC (rev 581) @@ -22,9 +22,7 @@ package org.jboss.dna.graph.sequencers; import org.jboss.dna.graph.properties.Name; -import org.jboss.dna.graph.properties.NamespaceRegistry; import org.jboss.dna.graph.properties.Path; -import org.jboss.dna.graph.properties.ValueFactories; /** * Interface for sequencers to use to generate their output. @@ -35,33 +33,15 @@ public interface SequencerOutput { /** - * Get the factories that can be used to create {@link Path paths} and other property values. - * - * @return the collection of factories; never null - * @deprecated Replaced by {@link SequencerContext#getFactories()}. - */ - @Deprecated - ValueFactories getFactories(); - - /** - * Convenience method to get the namespace registry used by the {@link ValueFactories#getNameFactory() name value factory}. - * - * @return the namespace registry; never <code>null</code> - * @deprecated Replaced by {@link SequencerContext#getNamespaceRegistry()}. - */ - @Deprecated - NamespaceRegistry getNamespaceRegistry(); - - /** * Set the supplied property on the supplied node. * - * The {@link #getFactories() value factories} should be used to create paths, names, and values. These factories can be used - * to create new values or convert values from one property type to another. (Note that each of the factories have methods - * that create values from all of the property types.) + * The {@link SequencerContext#getValueFactories() value factories} should be used to create paths, names, and values. These + * factories can be used to create new values or convert values from one property type to another. (Note that each of the + * factories have methods that create values from all of the property types.) * * * This method is provided as a convenience, but it identical to creating a {@link Path} and {@link Name} using the - * {@link #getFactories() factories} and calling {@link #setProperty(Path, Name, Object...)}. + * {@link SequencerContext#getValueFactories() factories} and calling {@link #setProperty(Path, Name, Object...)}. * * * @param nodePath the path to the node containing the property; may not be null @@ -76,7 +56,7 @@ * Set the supplied reference on the supplied node. * * This method is provided as a convenience, but it identical to creating a {@link Path} and {@link Name} using the - * {@link #getFactories() factories} and calling {@link #setProperty(Path, Name, Object...)}. + * {@link SequencerContext#getValueFactories() factories} and calling {@link #setProperty(Path, Name, Object...)}. * * * @param nodePath the path to the node containing the property; may not be null @@ -91,9 +71,9 @@ /** * Set the supplied property on the supplied node. * - * The {@link #getFactories() value factories} should be used to create paths, names, and values. These factories can be used - * to create new values or convert values from one property type to another. (Note that each of the factories have methods - * that create values from all of the property types.) + * The {@link SequencerContext#getValueFactories() value factories} should be used to create paths, names, and values. These + * factories can be used to create new values or convert values from one property type to another. (Note that each of the + * factories have methods that create values from all of the property types.) * * * @param nodePath the path to the node containing the property; may not be null Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/util/GraphImporter.java 2008-10-24 18:08:17 UTC (rev 581) @@ -25,9 +25,12 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URI; +import java.security.AccessControlContext; import java.util.HashSet; import java.util.LinkedList; import java.util.Set; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.monitor.SimpleProgressMonitor; @@ -59,6 +62,7 @@ /** * @author Randall Hauch + * @author John Verhaeg */ public class GraphImporter { @@ -208,27 +212,13 @@ this.primaryTypeName = this.nameFactory.create("jcr:primaryType"); } - /** - * {@inheritDoc} - * - * @see org.jboss.dna.graph.sequencers.SequencerOutput#getFactories() - */ - public ValueFactories getFactories() { + private ValueFactories getFactories() { return getContext().getValueFactories(); } /** * {@inheritDoc} * - * @see org.jboss.dna.graph.sequencers.SequencerOutput#getNamespaceRegistry() - */ - public NamespaceRegistry getNamespaceRegistry() { - return getContext().getNamespaceRegistry(); - } - - /** - * {@inheritDoc} - * * @see org.jboss.dna.graph.sequencers.SequencerOutput#setProperty(java.lang.String, java.lang.String, java.lang.Object[]) */ public void setProperty( String nodePath, @@ -321,15 +311,24 @@ /** * {@inheritDoc} * - * @see org.jboss.dna.graph.sequencers.SequencerContext#getFactories() + * @see org.jboss.dna.graph.ExecutionContext#getAccessControlContext() */ - public ValueFactories getFactories() { - return getContext().getValueFactories(); + public AccessControlContext getAccessControlContext() { + return getContext().getAccessControlContext(); } /** * {@inheritDoc} * + * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) + */ + public ClassLoader getClassLoader( String... classpath ) { + return getContext().getClassLoader(classpath); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.sequencers.SequencerContext#getInputPath() */ public Path getInputPath() { @@ -378,6 +377,15 @@ /** * {@inheritDoc} * + * @see org.jboss.dna.graph.ExecutionContext#getLoginContext() + */ + public LoginContext getLoginContext() { + return getContext().getLoginContext(); + } + + /** + * {@inheritDoc} + * * @see org.jboss.dna.graph.sequencers.SequencerContext#getMimeType() */ public String getMimeType() { @@ -393,6 +401,32 @@ return getContext().getNamespaceRegistry(); } + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() + */ + public PropertyFactory getPropertyFactory() { + return getContext().getPropertyFactory(); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getSubject() + */ + public Subject getSubject() { + return getContext().getSubject(); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getValueFactories() + */ + public ValueFactories getValueFactories() { + return getContext().getValueFactories(); + } } } Modified: trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlSequencer.java =================================================================== --- trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlSequencer.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-graph/src/main/java/org/jboss/dna/graph/xml/XmlSequencer.java 2008-10-24 18:08:17 UTC (rev 581) @@ -160,9 +160,9 @@ this.context = context; this.monitor = monitor; // Initialize path to a an empty path relative to the SequencerOutput's target path. - path = context.getFactories().getPathFactory().createRelativePath(); + path = context.getValueFactories().getPathFactory().createRelativePath(); // Cache name factory since it is frequently used - nameFactory = context.getFactories().getNameFactory(); + nameFactory = context.getValueFactories().getNameFactory(); } /** @@ -560,7 +560,7 @@ indexedNames.add(indexedName); // Add element name and the appropriate index to the path. // Per the JCR spec, the index must be relative to same-name sibling nodes - path = context.getFactories().getPathFactory().create(path, name, indexedNames.size()); + path = context.getValueFactories().getPathFactory().create(path, name, indexedNames.size()); path = path.getNormalizedPath(); // Add the indexed name map to the stack and set the current map to the new element's map nameToIndexedNamesMapStack.addFirst(nameToIndexedNamesMap); Added: trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java (rev 0) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java 2008-10-24 18:08:17 UTC (rev 581) @@ -0,0 +1,175 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.graph.sequencers; + +import java.security.AccessControlContext; +import java.util.Set; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; +import net.jcip.annotations.Immutable; +import org.jboss.dna.common.util.Logger; +import org.jboss.dna.graph.DnaLexicon; +import org.jboss.dna.graph.properties.Name; +import org.jboss.dna.graph.properties.NamespaceRegistry; +import org.jboss.dna.graph.properties.Path; +import org.jboss.dna.graph.properties.Property; +import org.jboss.dna.graph.properties.PropertyFactory; +import org.jboss.dna.graph.properties.ValueFactories; +import org.jboss.dna.graph.properties.basic.BasicNamespaceRegistry; +import org.jboss.dna.graph.properties.basic.StandardValueFactories; + +/** + * @author jverhaeg + */ +@Immutable +public class MockSequencerContext implements SequencerContext { + + private final ValueFactories factories; + private final NamespaceRegistry registry = new BasicNamespaceRegistry(); + + public MockSequencerContext() { + registry.register("jcr", "http://www.jcp.org/jcr/1.0"); + registry.register("mix", "http://www.jcp.org/jcr/mix/1.0"); + registry.register("nt", "http://www.jcp.org/jcr/nt/1.0"); + registry.register(DnaLexicon.Namespace.PREFIX, DnaLexicon.Namespace.URI); + registry.register("dnadtd", "http://www.jboss.org/dna/dtd/1.0"); + registry.register("dnaxml", "http://www.jboss.org/dna/xml/1.0"); + factories = new StandardValueFactories(registry); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) + */ + public ClassLoader getClassLoader( String... classpath ) { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getInputPath() + */ + public Path getInputPath() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getInputProperties() + */ + public Set<Property> getInputProperties() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getInputProperty(org.jboss.dna.graph.properties.Name) + */ + public Property getInputProperty( Name name ) { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getMimeType() + */ + public String getMimeType() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getAccessControlContext() + */ + public AccessControlContext getAccessControlContext() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getLogger(java.lang.Class) + */ + public Logger getLogger( Class<?> clazz ) { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getLogger(java.lang.String) + */ + public Logger getLogger( String name ) { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getLoginContext() + */ + public LoginContext getLoginContext() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getNamespaceRegistry() + */ + public NamespaceRegistry getNamespaceRegistry() { + return registry; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() + */ + public PropertyFactory getPropertyFactory() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getSubject() + */ + public Subject getSubject() { + return null; + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getValueFactories() + */ + public ValueFactories getValueFactories() { + return factories; + } +} Property changes on: trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerContext.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerOutput.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerOutput.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/sequencers/MockSequencerOutput.java 2008-10-24 18:08:17 UTC (rev 581) @@ -24,15 +24,9 @@ import java.util.HashMap; import java.util.Map; import net.jcip.annotations.NotThreadSafe; -import org.jboss.dna.graph.DnaLexicon; import org.jboss.dna.graph.properties.Name; -import org.jboss.dna.graph.properties.NamespaceRegistry; import org.jboss.dna.graph.properties.Path; import org.jboss.dna.graph.properties.PathFactory; -import org.jboss.dna.graph.properties.ValueFactories; -import org.jboss.dna.graph.properties.basic.BasicNamespaceRegistry; -import org.jboss.dna.graph.properties.basic.StandardValueFactories; -import org.jboss.dna.graph.sequencers.SequencerOutput; /** * @author Randall Hauch @@ -42,43 +36,16 @@ public class MockSequencerOutput implements SequencerOutput { private final Map<Path, Object[]> properties; - private final ValueFactories factories; + private final SequencerContext context; - /** - */ - public MockSequencerOutput() { + public MockSequencerOutput( SequencerContext context ) { + this.context = context; this.properties = new HashMap<Path, Object[]>(); - NamespaceRegistry registry = new BasicNamespaceRegistry(); - registry.register("jcr", "http://www.jcp.org/jcr/1.0"); - registry.register("mix", "http://www.jcp.org/jcr/mix/1.0"); - registry.register("nt", "http://www.jcp.org/jcr/nt/1.0"); - registry.register(DnaLexicon.Namespace.PREFIX, DnaLexicon.Namespace.URI); - registry.register("dnadtd", "http://www.jboss.org/dna/dtd/1.0"); - registry.register("dnaxml", "http://www.jboss.org/dna/xml/1.0"); - factories = new StandardValueFactories(registry); } /** * {@inheritDoc} */ - public ValueFactories getFactories() { - return this.factories; - } - - /** - * - * {@inheritDoc} - * - * - * @see org.jboss.dna.graph.sequencers.SequencerOutput#getNamespaceRegistry() - */ - public NamespaceRegistry getNamespaceRegistry() { - return factories.getNameFactory().getNamespaceRegistry(); - } - - /** - * {@inheritDoc} - */ public void setProperty( Path nodePath, Name propertyName, Object... values ) { @@ -96,8 +63,8 @@ public void setProperty( String nodePath, String propertyName, Object... values ) { - Path path = this.factories.getPathFactory().create(nodePath); - Name name = this.factories.getNameFactory().create(propertyName); + Path path = context.getValueFactories().getPathFactory().create(nodePath); + Name name = context.getValueFactories().getNameFactory().create(propertyName); setProperty(path, name, values); } @@ -107,9 +74,9 @@ public void setReference( String nodePath, String propertyName, String... paths ) { - PathFactory pathFactory = this.factories.getPathFactory(); + PathFactory pathFactory = context.getValueFactories().getPathFactory(); Path path = pathFactory.create(nodePath); - Name name = this.factories.getNameFactory().create(propertyName); + Name name = context.getValueFactories().getNameFactory().create(propertyName); Object[] values = null; if (paths != null && paths.length != 0) { values = new Path[paths.length]; @@ -139,14 +106,14 @@ protected Path createKey( String nodePath, String propertyName ) { - Path path = this.factories.getPathFactory().create(nodePath); - Name name = this.factories.getNameFactory().create(propertyName); + Path path = context.getValueFactories().getPathFactory().create(nodePath); + Name name = context.getValueFactories().getNameFactory().create(propertyName); return createKey(path, name); } protected Path createKey( Path nodePath, Name propertyName ) { - return this.factories.getPathFactory().create(nodePath, propertyName); + return context.getValueFactories().getPathFactory().create(nodePath, propertyName); } } Modified: trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlSequencerTest.java =================================================================== --- trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlSequencerTest.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-graph/src/test/java/org/jboss/dna/graph/xml/XmlSequencerTest.java 2008-10-24 18:08:17 UTC (rev 581) @@ -25,7 +25,6 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.stub; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -33,13 +32,12 @@ import org.jboss.dna.common.monitor.SimpleProgressMonitor; import org.jboss.dna.graph.properties.Name; import org.jboss.dna.graph.properties.NameFactory; +import org.jboss.dna.graph.sequencers.MockSequencerContext; import org.jboss.dna.graph.sequencers.MockSequencerOutput; import org.jboss.dna.graph.sequencers.SequencerContext; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.MockitoAnnotations; -import org.mockito.MockitoAnnotations.Mock; /** * @author John Verhaeg @@ -70,14 +68,13 @@ private URL xml3; private URL xml4; private URL xsd; - @Mock private SequencerContext context; @Before public void beforeEach() { - MockitoAnnotations.initMocks(this); sequencer = new XmlSequencer(); - output = new MockSequencerOutput(); + context = new MockSequencerContext(); + output = new MockSequencerOutput(context); monitor = new SimpleProgressMonitor("Test activity"); xml1 = this.getClass().getClassLoader().getResource("jackrabbitInMemoryTestRepositoryConfig.xml"); assertThat(xml1, is(notNullValue())); @@ -89,8 +86,6 @@ assertThat(xml4, is(notNullValue())); xsd = this.getClass().getClassLoader().getResource("Descriptor.1.0.xsd"); assertThat(xsd, is(notNullValue())); - stub(context.getFactories()).toReturn(output.getFactories()); - stub(context.getNamespaceRegistry()).toReturn(output.getNamespaceRegistry()); } @After @@ -215,7 +210,7 @@ String property, String expectedName ) { Name name = verify(nodePath, property, Name.class); - assertThat(name, is(output.getFactories().getNameFactory().create(expectedName))); + assertThat(name, is(context.getValueFactories().getNameFactory().create(expectedName))); } private void verifyString( String nodePath, Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerNodeContext.java 2008-10-24 18:08:17 UTC (rev 581) @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; +import java.security.AccessControlContext; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -31,6 +32,8 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; +import javax.security.auth.Subject; +import javax.security.auth.login.LoginContext; import net.jcip.annotations.Immutable; import org.jboss.dna.common.util.CheckArg; import org.jboss.dna.common.util.Logger; @@ -38,6 +41,7 @@ import org.jboss.dna.graph.properties.NamespaceRegistry; import org.jboss.dna.graph.properties.Path; import org.jboss.dna.graph.properties.Property; +import org.jboss.dna.graph.properties.PropertyFactory; import org.jboss.dna.graph.properties.ValueFactories; import org.jboss.dna.graph.sequencers.SequencerContext; import org.jboss.dna.graph.sequencers.StreamSequencer; @@ -135,8 +139,26 @@ /** * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getAccessControlContext() */ - public ValueFactories getFactories() { + public AccessControlContext getAccessControlContext() { + return context.getAccessControlContext(); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.common.component.ClassLoaderFactory#getClassLoader(java.lang.String[]) + */ + public ClassLoader getClassLoader( String... classpath ) { + return context.getClassLoader(classpath); + } + + /** + * {@inheritDoc} + */ + public ValueFactories getValueFactories() { return factories; } @@ -206,7 +228,34 @@ /** * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getLogger(java.lang.Class) */ + public Logger getLogger( Class<?> clazz ) { + return context.getLogger(clazz); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.sequencers.SequencerContext#getLogger(java.lang.String) + */ + public Logger getLogger( String name ) { + return context.getLogger(name); + } + + /** + * {@inheritDoc} + * + * @see org.jboss.dna.graph.ExecutionContext#getLoginContext() + */ + public LoginContext getLoginContext() { + return context.getLoginContext(); + } + + /** + * {@inheritDoc} + */ public NamespaceRegistry getNamespaceRegistry() { return factories.getNameFactory().getNamespaceRegistry(); } @@ -214,18 +263,18 @@ /** * {@inheritDoc} * - * @see org.jboss.dna.graph.sequencers.SequencerContext#getLogger(java.lang.Class) + * @see org.jboss.dna.graph.ExecutionContext#getPropertyFactory() */ - public Logger getLogger( Class<?> clazz ) { - return context.getLogger(clazz); + public PropertyFactory getPropertyFactory() { + return context.getPropertyFactory(); } /** * {@inheritDoc} * - * @see org.jboss.dna.graph.sequencers.SequencerContext#getLogger(java.lang.String) + * @see org.jboss.dna.graph.ExecutionContext#getSubject() */ - public Logger getLogger( String name ) { - return context.getLogger(name); + public Subject getSubject() { + return context.getSubject(); } } Modified: trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerOutputMap.java =================================================================== --- trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerOutputMap.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-repository/src/main/java/org/jboss/dna/repository/sequencers/SequencerOutputMap.java 2008-10-24 18:08:17 UTC (rev 581) @@ -34,340 +34,326 @@ import org.jboss.dna.common.util.StringUtil; import org.jboss.dna.graph.properties.Name; import org.jboss.dna.graph.properties.NameFactory; -import org.jboss.dna.graph.properties.NamespaceRegistry; import org.jboss.dna.graph.properties.Path; import org.jboss.dna.graph.properties.PathFactory; import org.jboss.dna.graph.properties.ValueFactories; import org.jboss.dna.graph.sequencers.SequencerOutput; /** - * A basic {@link SequencerOutput} that records all information in-memory and which organizes the properties by - * {@link Path node paths} and provides access to the nodes in a natural path-order. - * + * A basic {@link SequencerOutput} that records all information in-memory and which organizes the properties by {@link Path node + * paths} and provides access to the nodes in a natural path-order. + * * @author Randall Hauch + * @author John Verhaeg */ @NotThreadSafe public class SequencerOutputMap implements SequencerOutput, Iterable<SequencerOutputMap.Entry> { - private static final String JCR_NAME_PROPERTY_NAME = "jcr:name"; + private static final String JCR_NAME_PROPERTY_NAME = "jcr:name"; - private final Map<Path, List<PropertyValue>> data; - private transient boolean valuesSorted = true; - private final ValueFactories factories; - private final Name jcrName; + private final Map<Path, List<PropertyValue>> data; + private transient boolean valuesSorted = true; + private final ValueFactories factories; + private final Name jcrName; - public SequencerOutputMap( ValueFactories factories ) { - CheckArg.isNotNull(factories, "factories"); - this.data = new HashMap<Path, List<PropertyValue>>(); - this.factories = factories; - this.jcrName = this.factories.getNameFactory().create(JCR_NAME_PROPERTY_NAME); - } + public SequencerOutputMap( ValueFactories factories ) { + CheckArg.isNotNull(factories, "factories"); + this.data = new HashMap<Path, List<PropertyValue>>(); + this.factories = factories; + this.jcrName = this.factories.getNameFactory().create(JCR_NAME_PROPERTY_NAME); + } - /** - * {@inheritDoc} - */ - public ValueFactories getFactories() { - return this.factories; - } + ValueFactories getFactories() { + return this.factories; + } - /** - * - * {@inheritDoc} - * - * - * @see org.jboss.dna.graph.sequencers.SequencerOutput#getNamespaceRegistry() - */ - public NamespaceRegistry getNamespaceRegistry() { - return factories.getNameFactory().getNamespaceRegistry(); - } + /** + * {@inheritDoc} + */ + public void setProperty( Path nodePath, + Name propertyName, + Object... values ) { + CheckArg.isNotNull(nodePath, "nodePath"); + CheckArg.isNotNull(propertyName, "property"); + // Ignore the "jcr:name" property, as that's handled by the path ... + if (this.jcrName.equals(propertyName)) return; - /** - * {@inheritDoc} - */ - public void setProperty( Path nodePath, - Name propertyName, - Object... values ) { - CheckArg.isNotNull(nodePath, "nodePath"); - CheckArg.isNotNull(propertyName, "property"); - // Ignore the "jcr:name" property, as that's handled by the path ... - if (this.jcrName.equals(propertyName)) return; + // Find or create the entry for this node ... + List<PropertyValue> properties = this.data.get(nodePath); + if (properties == null) { + if (values == null || values.length == 0) return; // do nothing + properties = new ArrayList<PropertyValue>(); + this.data.put(nodePath, properties); + } + if (values == null || values.length == 0) { + properties.remove(new PropertyValue(propertyName, null)); + } else { + Object propValue = values.length == 1 ? values[0] : values; + PropertyValue value = new PropertyValue(propertyName, propValue); + properties.add(value); + valuesSorted = false; + } + } - // Find or create the entry for this node ... - List<PropertyValue> properties = this.data.get(nodePath); - if (properties == null) { - if (values == null || values.length == 0) return; // do nothing - properties = new ArrayList<PropertyValue>(); - this.data.put(nodePath, properties); - } - if (values == null || values.length == 0) { - properties.remove(new PropertyValue(propertyName, null)); - } else { - Object propValue = values.length == 1 ? values[0] : values; - PropertyValue value = new PropertyValue(propertyName, propValue); - properties.add(value); - valuesSorted = false; - } - } + /** + * {@inheritDoc} + */ + public void setProperty( String nodePath, + String property, + Object... values ) { + CheckArg.isNotEmpty(nodePath, "nodePath"); + CheckArg.isNotEmpty(property, "property"); + Path path = this.factories.getPathFactory().create(nodePath); + Name propertyName = this.factories.getNameFactory().create(property); + setProperty(path, propertyName, values); + } - /** - * {@inheritDoc} - */ - public void setProperty( String nodePath, - String property, - Object... values ) { - CheckArg.isNotEmpty(nodePath, "nodePath"); - CheckArg.isNotEmpty(property, "property"); - Path path = this.factories.getPathFactory().create(nodePath); - Name propertyName = this.factories.getNameFactory().create(property); - setProperty(path, propertyName, values); - } + /** + * {@inheritDoc} + */ + public void setReference( String nodePath, + String propertyName, + String... paths ) { + PathFactory pathFactory = this.factories.getPathFactory(); + Path path = pathFactory.create(nodePath); + Name name = this.factories.getNameFactory().create(propertyName); + Object[] values = null; + if (paths != null && paths.length != 0) { + values = new Path[paths.length]; + for (int i = 0, len = paths.length; i != len; ++i) { + String pathValue = paths[i]; + values[i] = pathFactory.create(pathValue); + } + } + setProperty(path, name, values); + } - /** - * {@inheritDoc} - */ - public void setReference( String nodePath, - String propertyName, - String... paths ) { - PathFactory pathFactory = this.factories.getPathFactory(); - Path path = pathFactory.create(nodePath); - Name name = this.factories.getNameFactory().create(propertyName); - Object[] values = null; - if (paths != null && paths.length != 0) { - values = new Path[paths.length]; - for (int i = 0, len = paths.length; i != len; ++i) { - String pathValue = paths[i]; - values[i] = pathFactory.create(pathValue); - } - } - setProperty(path, name, values); - } + /** + * Return the number of node entries in this map. + * + * @return the number of entries + */ + public int size() { + return this.data.size(); + } - /** - * Return the number of node entries in this map. - * - * @return the number of entries - */ - public int size() { - return this.data.size(); - } + /** + * Return whether there are no entries + * + * @return true if this container is empty, or false otherwise + */ + public boolean isEmpty() { + return this.data.isEmpty(); + } - /** - * Return whether there are no entries - * - * @return true if this container is empty, or false otherwise - */ - public boolean isEmpty() { - return this.data.isEmpty(); - } + protected List<PropertyValue> removeProperties( Path nodePath ) { + return this.data.remove(nodePath); + } - protected List<PropertyValue> removeProperties( Path nodePath ) { - return this.data.remove(nodePath); - } + /** + * Get the properties for the node given by the supplied path. + * + * @param nodePath the path to the node + * @return the property values, or null if there are none + */ + protected List<PropertyValue> getProperties( Path nodePath ) { + return data.get(nodePath); + } - /** - * Get the properties for the node given by the supplied path. - * - * @param nodePath the path to the node - * @return the property values, or null if there are none - */ - protected List<PropertyValue> getProperties( Path nodePath ) { - return data.get(nodePath); - } + /** + * Return the entries in this output in an order with shorter paths first. + * + * {@inheritDoc} + */ + public Iterator<Entry> iterator() { + LinkedList<Path> paths = new LinkedList<Path>(data.keySet()); + Collections.sort(paths); + sortValues(); + return new EntryIterator(paths.iterator()); + } - /** - * Return the entries in this output in an order with shorter paths first. - * - * {@inheritDoc} - */ - public Iterator<Entry> iterator() { - LinkedList<Path> paths = new LinkedList<Path>(data.keySet()); - Collections.sort(paths); - sortValues(); - return new EntryIterator(paths.iterator()); - } + protected void sortValues() { + if (!valuesSorted) { + for (List<PropertyValue> values : this.data.values()) { + if (values.size() > 1) Collections.sort(values); + } + valuesSorted = true; + } + } - protected void sortValues() { - if (!valuesSorted) { - for (List<PropertyValue> values : this.data.values()) { - if (values.size() > 1) Collections.sort(values); - } - valuesSorted = true; - } - } + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return StringUtil.readableString(this.data); + } - /** - * {@inheritDoc} - */ - @Override - public String toString() { - return StringUtil.readableString(this.data); - } + /** + * A property name and value pair. PropertyValue instances have a natural order where the <code>jcr:primaryType</code> is + * first, followed by all other properties in ascending lexicographical order according to the {@link #getName() name}. + * + * @author Randall Hauch + */ + @Immutable + public class PropertyValue implements Comparable<PropertyValue> { - /** - * A property name and value pair. PropertyValue instances have a natural order where the <code>jcr:primaryType</code> is - * first, followed by all other properties in ascending lexicographical order according to the {@link #getName() name}. - * - * @author Randall Hauch - */ - @Immutable - public class PropertyValue implements Comparable<PropertyValue> { + private final Name name; + private final Object value; - private final Name name; - private final Object value; + protected PropertyValue( Name propertyName, + Object value ) { + this.name = propertyName; + this.value = value; + } - protected PropertyValue( Name propertyName, - Object value ) { - this.name = propertyName; - this.value = value; - } + /** + * Get the property name. + * + * @return the property name; never null + */ + public Name getName() { + return this.name; + } - /** - * Get the property name. - * - * @return the property name; never null - */ - public Name getName() { - return this.name; - } + /** + * Get the property value, which is either a single value or an array of values. + * + * @return the property value + */ + public Object getValue() { + return this.value; + } - /** - * Get the property value, which is either a single value or an array of values. - * - * @return the property value - */ - public Object getValue() { - return this.value; - } + /** + * {@inheritDoc} + */ + public int compareTo( PropertyValue that ) { + if (this == that) return 0; + if (this.name.equals(NameFactory.JCR_PRIMARY_TYPE)) return -1; + if (that.name.equals(NameFactory.JCR_PRIMARY_TYPE)) return 1; + return this.name.compareTo(that.name); + } - /** - * {@inheritDoc} - */ - public int compareTo( PropertyValue that ) { - if (this == that) return 0; - if (this.name.equals(NameFactory.JCR_PRIMARY_TYPE)) return -1; - if (that.name.equals(NameFactory.JCR_PRIMARY_TYPE)) return 1; - return this.name.compareTo(that.name); - } + /** + * {@inheritDoc} + */ + @Override + public int hashCode() { + return this.name.hashCode(); + } - /** - * {@inheritDoc} - */ - @Override - public int hashCode() { - return this.name.hashCode(); - } + /** + * {@inheritDoc} + */ + @Override + public boolean equals( Object obj ) { + if (obj == this) return true; + if (obj instanceof PropertyValue) { + PropertyValue that = (PropertyValue)obj; + if (!this.getName().equals(that.getName())) return false; + return true; + } + return false; + } - /** - * {@inheritDoc} - */ - @Override - public boolean equals( Object obj ) { - if (obj == this) return true; - if (obj instanceof PropertyValue) { - PropertyValue that = (PropertyValue)obj; - if (!this.getName().equals(that.getName())) return false; - return true; - } - return false; - } + /** + * {@inheritDoc} + */ + @Override + public String toString() { + return "[" + this.name + "=" + StringUtil.readableString(value) + "]"; + } + } - /** - * {@inheritDoc} - */ - @Override - public String toString() { - return "[" + this.name + "=" + StringUtil.readableString(value) + "]"; - } - } + /** + * An entry in a SequencerOutputMap, which contains the path of the node and the {@link #getPropertyValues() property values} + * on the node. + * + * @author Randall Hauch + */ + @Immutable + public class Entry { - /** - * An entry in a SequencerOutputMap, which contains the path of the node and the {@link #getPropertyValues() property values} - * on the node. - * - * @author Randall Hauch - */ - @Immutable - public class Entry { + private final Path path; + private final Name primaryType; + private final List<PropertyValue> properties; - private final Path path; - private final Name primaryType; - private final List<PropertyValue> properties; + protected Entry( Path path, + List<PropertyValue> properties ) { + assert path != null; + assert properties != null; + this.path = path; + this.properties = properties; + if (this.properties.size() > 0 && this.properties.get(0).getName().equals("jcr:primaryType")) { + PropertyValue primaryTypeProperty = this.properties.remove(0); + this.primaryType = getFactories().getNameFactory().create(primaryTypeProperty.getValue()); + } else { + this.primaryType = null; + } + } - protected Entry( Path path, - List<PropertyValue> properties ) { - assert path != null; - assert properties != null; - this.path = path; - this.properties = properties; - if (this.properties.size() > 0 && this.properties.get(0).getName().equals("jcr:primaryType")) { - PropertyValue primaryTypeProperty = this.properties.remove(0); - this.primaryType = getFactories().getNameFactory().create(primaryTypeProperty.getValue()); - } else { - this.primaryType = null; - } - } + /** + * @return path + */ + public Path getPath() { + return this.path; + } - /** - * @return path - */ - public Path getPath() { - return this.path; - } + /** + * Get the primary type specified for this node, or null if the type was not specified + * + * @return the primary type, or null + */ + public Name getPrimaryTypeValue() { + return this.primaryType; + } - /** - * Get the primary type specified for this node, or null if the type was not specified - * - * @return the primary type, or null - */ - public Name getPrimaryTypeValue() { - return this.primaryType; - } + /** + * Get the property values, which may be empty + * + * @return value + */ + public List<PropertyValue> getPropertyValues() { + return getProperties(path); + } + } - /** - * Get the property values, which may be empty - * - * @return value - */ - public List<PropertyValue> getPropertyValues() { - return getProperties(path); - } - } + protected class EntryIterator implements Iterator<Entry> { - protected class EntryIterator implements Iterator<Entry> { + private Path last; + private final Iterator<Path> iter; - private Path last; - private final Iterator<Path> iter; + protected EntryIterator( Iterator<Path> iter ) { + this.iter = iter; + } - protected EntryIterator( Iterator<Path> iter ) { - this.iter = iter; - } + /** + * {@inheritDoc} + */ + public boolean hasNext() { + return iter.hasNext(); + } - /** - * {@inheritDoc} - */ - public boolean hasNext() { - return iter.hasNext(); - } + /** + * {@inheritDoc} + */ + public Entry next() { + this.last = iter.next(); + return new Entry(last, getProperties(last)); + } - /** - * {@inheritDoc} - */ - public Entry next() { - this.last = iter.next(); - return new Entry(last, getProperties(last)); - } + /** + * {@inheritDoc} + */ + public void remove() { + if (last == null) throw new IllegalStateException(); + try { + removeProperties(last); + } finally { + last = null; + } + } + } - /** - * {@inheritDoc} - */ - public void remove() { - if (last == null) throw new IllegalStateException(); - try { - removeProperties(last); - } finally { - last = null; - } - } - } - } Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/SequencerNodeContextTest.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/SequencerNodeContextTest.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/SequencerNodeContextTest.java 2008-10-24 18:08:17 UTC (rev 581) @@ -132,7 +132,7 @@ public void shouldProvideValueFactories() throws Exception { Node input = tools.findOrCreateNode(session, "/a/b/c"); SequencerNodeContext sequencerContext = new SequencerNodeContext(input, sequencedProperty, execContext); - assertThat(sequencerContext.getFactories(), notNullValue()); + assertThat(sequencerContext.getValueFactories(), notNullValue()); } @Test Modified: trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/StreamSequencerAdapterTest.java =================================================================== --- trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/StreamSequencerAdapterTest.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/dna-repository/src/test/java/org/jboss/dna/repository/sequencers/StreamSequencerAdapterTest.java 2008-10-24 18:08:17 UTC (rev 581) @@ -45,18 +45,19 @@ import org.jboss.dna.graph.sequencers.SequencerOutput; import org.jboss.dna.graph.sequencers.StreamSequencer; import org.jboss.dna.repository.observation.NodeChange; +import org.jboss.dna.repository.util.BasicJcrExecutionContext; import org.jboss.dna.repository.util.JcrExecutionContext; import org.jboss.dna.repository.util.JcrNamespaceRegistry; import org.jboss.dna.repository.util.JcrTools; import org.jboss.dna.repository.util.RepositoryNodePath; import org.jboss.dna.repository.util.SessionFactory; -import org.jboss.dna.repository.util.BasicJcrExecutionContext; import org.junit.After; import org.junit.Before; import org.junit.Test; /** * @author Randall Hauch + * @author John Verhaeg */ public class StreamSequencerAdapterTest extends AbstractJcrRepositoryTest { @@ -90,8 +91,8 @@ this.streamSequencer = new StreamSequencer() { /** - * This method always copies the {@link StreamSequencerAdapterTest#sequencerOutput} data into the output {@inheritDoc}, - * and does nothing else with any of the other parameters. + * This method always copies the {@link StreamSequencerAdapterTest#sequencerOutput} data into the output {@inheritDoc} + * , and does nothing else with any of the other parameters. */ public void sequence( InputStream stream, SequencerOutput output, @@ -370,7 +371,7 @@ @Test public void shouldSequencerOutputProvideAccessToNamespaceRegistry() { - assertThat(sequencerOutput.getNamespaceRegistry(), notNullValue()); + assertThat(context.getNamespaceRegistry(), notNullValue()); } @Test Modified: trunk/extensions/dna-sequencer-images/src/main/java/org/jboss/dna/sequencer/images/ImageMetadataSequencer.java =================================================================== --- trunk/extensions/dna-sequencer-images/src/main/java/org/jboss/dna/sequencer/images/ImageMetadataSequencer.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/extensions/dna-sequencer-images/src/main/java/org/jboss/dna/sequencer/images/ImageMetadataSequencer.java 2008-10-24 18:08:17 UTC (rev 581) @@ -46,11 +46,10 @@ * <li>image:bitsPerPixel - optional integer property for the number of bits per pixel</li> * <li>image:progressive - optional boolean property specifying whether the image is stored in a progressive * (i.e., interlaced) form</li> - * <li>image:numberOfImages - optional integer property for the number of images stored in the file; defaults - * to 1</li> + * <li>image:numberOfImages - optional integer property for the number of images stored in the file; defaults to + * 1</li> * <li>image:physicalWidthDpi - optional integer property for the physical width of the image in dots per inch</li> - * <li>image:physicalHeightDpi - optional integer property for the physical height of the image in dots per - * inch</li> + * <li>image:physicalHeightDpi - optional integer property for the physical height of the image in dots per inch</li> * <li>image:physicalWidthInches - optional double property for the physical width of the image in inches</li> * <li>image:physicalHeightInches - optional double property for the physical height of the image in inches</li> * </ul> @@ -65,6 +64,7 @@ * * * @author Randall Hauch + * @author John Verhaeg */ public class ImageMetadataSequencer implements StreamSequencer { @@ -109,8 +109,8 @@ // Generate the output graph if we found useful metadata ... if (metadata != null) { - NameFactory nameFactory = context.getFactories().getNameFactory(); - PathFactory pathFactory = context.getFactories().getPathFactory(); + NameFactory nameFactory = context.getValueFactories().getNameFactory(); + PathFactory pathFactory = context.getValueFactories().getPathFactory(); Path metadataNode = pathFactory.create(METADATA_NODE); // Place the image metadata into the output map ... Modified: trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java =================================================================== --- trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/extensions/dna-sequencer-images/src/test/java/org/jboss/dna/sequencer/images/ImageMetadataSequencerTest.java 2008-10-24 18:08:17 UTC (rev 581) @@ -25,22 +25,21 @@ import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.number.IsCloseTo.closeTo; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.stub; import java.io.IOException; import java.io.InputStream; import java.net.URL; import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.monitor.SimpleProgressMonitor; +import org.jboss.dna.graph.sequencers.MockSequencerContext; import org.jboss.dna.graph.sequencers.MockSequencerOutput; import org.jboss.dna.graph.sequencers.SequencerContext; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.MockitoAnnotations; -import org.mockito.MockitoAnnotations.Mock; /** * @author Randall Hauch + * @author John Verhaeg */ public class ImageMetadataSequencerTest { @@ -52,21 +51,19 @@ private URL cautionJpg; private URL cautionPict; private URL cautionPng; - @Mock private SequencerContext context; @Before public void beforeEach() { - MockitoAnnotations.initMocks(this); sequencer = new ImageMetadataSequencer(); - output = new MockSequencerOutput(); - output.getNamespaceRegistry().register("image", "http://jboss.org/dna/images/1.0"); + context = new MockSequencerContext(); + context.getNamespaceRegistry().register("image", "http://jboss.org/dna/images/1.0"); + output = new MockSequencerOutput(context); progress = new SimpleProgressMonitor("Test activity"); cautionGif = this.getClass().getClassLoader().getResource("caution.gif"); cautionJpg = this.getClass().getClassLoader().getResource("caution.jpg"); cautionPict = this.getClass().getClassLoader().getResource("caution.pict"); cautionPng = this.getClass().getClassLoader().getResource("caution.png"); - stub(context.getFactories()).toReturn(output.getFactories()); } @After Modified: trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/extensions/dna-sequencer-java/src/main/java/org/jboss/dna/sequencer/java/JavaMetadataSequencer.java 2008-10-24 18:08:17 UTC (rev 581) @@ -167,6 +167,7 @@ * * * @author Serge Pagop + * @author John Verhaeg */ public class JavaMetadataSequencer implements JavaSourceCndDefinition, StreamSequencer { @@ -184,8 +185,8 @@ progressMonitor.beginTask(10, JavaMetadataI18n.sequencerTaskName); JavaMetadata javaMetadata = null; - NameFactory nameFactory = context.getFactories().getNameFactory(); - PathFactory pathFactory = context.getFactories().getPathFactory(); + NameFactory nameFactory = context.getValueFactories().getNameFactory(); + PathFactory pathFactory = context.getValueFactories().getPathFactory(); try { javaMetadata = JavaMetadata.instance(stream, JavaMetadataUtil.length(stream), null, progressMonitor.createSubtask(10)); @@ -699,9 +700,13 @@ methodReturnPrimitiveType.getType()); } - if(methodReturnType instanceof SimpleTypeFieldMetadata) { - SimpleTypeFieldMetadata simpleTypeFieldMetadata = (SimpleTypeFieldMetadata) methodReturnType; - SimpleTypeMetadataSequencer.sequenceMethodReturnType(output,nameFactory,pathFactory,simpleTypeFieldMetadata,methodRootPath); + if (methodReturnType instanceof SimpleTypeFieldMetadata) { + SimpleTypeFieldMetadata simpleTypeFieldMetadata = (SimpleTypeFieldMetadata)methodReturnType; + SimpleTypeMetadataSequencer.sequenceMethodReturnType(output, + nameFactory, + pathFactory, + simpleTypeFieldMetadata, + methodRootPath); } // TODO method return reference type Modified: trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java =================================================================== --- trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-10-24 18:04:46 UTC (rev 580) +++ trunk/extensions/dna-sequencer-java/src/test/java/org/jboss/dna/sequencer/java/JavaMetadataSequencerTest.java 2008-10-24 18:08:17 UTC (rev 581) @@ -24,7 +24,6 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.stub; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -32,16 +31,16 @@ import java.io.InputStream; import org.jboss.dna.common.monitor.ProgressMonitor; import org.jboss.dna.common.monitor.SimpleProgressMonitor; +import org.jboss.dna.graph.sequencers.MockSequencerContext; import org.jboss.dna.graph.sequencers.MockSequencerOutput; import org.jboss.dna.graph.sequencers.SequencerContext; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.mockito.MockitoAnnotations; -import org.mockito.MockitoAnnotations.Mock; /** * @author Serge Pagop + * @author John Verhaeg */ public class JavaMetadataSequencerTest { private JavaMetadataSequencer sequencer; @@ -49,18 +48,16 @@ private MockSequencerOutput output; private ProgressMonitor progress; private File source; - @Mock private SequencerContext context; @Before public void beforeEach() { - MockitoAnnotations.initMocks(this); + context = new MockSequencerContext(); + context.getNamespaceRegistry().register("java", "http://jboss.org/dna/java/1.0"); sequencer = new JavaMetadataSequencer(); - output = new MockSequencerOutput(); - output.getNamespaceRegistry().register("java", "http://jboss.org/dna/java/1.0"); + output = new MockSequencerOutput(context); this.progress = new SimpleProgressMonitor("Test java monitor activity"); source = new File("src/test/workspace/projectX/src/org/acme/MySource.java"); - stub(context.getFactories()).toReturn(output.getFactories()); } @After @@ -93,7 +90,9 @@ // TODO (find a solution to get the annotation of a package). Java Sequencer does not yet support sequencing of // package-info.java with package annotations - // assertThat(output.getPropertyValues("java:compilationUnit/java:package/java:packageDeclaration/java:annotation/java:annotationDeclaration/java:annotationType/java:markerAnnotation[1]", + // assertThat(output.getPropertyValues( + // "java:compilationUnit/java:package/java:packageDeclaration/java:annotation/java:annotationDeclaration/java:annotationType/java:markerAnnotation[1]" + // , // "java:typeName"), // is(new Object[] {"org.acme.annotation.MyPackageAnnotation"})); @@ -299,8 +298,8 @@ assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[5]/java:parameter/java:formalParameter[2]/java:type/java:arrayType/java:arrayTypeVariable/java:variable", "java:variableName"), is(new Object[] {"ia"})); - - // public Object doSomething3() method + + // public Object doSomething3() method assertThat(output.getPropertyValues("java:compilationUnit/java:unitType/java:classDeclaration/java:normalClass/java:normalClassDeclaration/java:method/java:methodDeclaration[6]/java:modifier/java:modifierDeclaration[1]", "java:modifierName"), is(new Object[] {"public"}));

15 years, 6 months

1
0
0 / 0

DNA SVN: r580 - in trunk/dna-graph/src: test/java/org/jboss/dna/graph and 1 other directory.

by dna-commits＠lists.jboss.org

Author: jverhaeg(a)redhat.com Date: 2008-10-24 14:04:46 -0400 (Fri, 24 Oct 2008) New Revision: 580 Removed: trunk/dna-graph/src/main/java/org/jboss/dna/graph/commands/ trunk/dna-graph/src/test/java/org/jboss/dna/graph/commands/ Log: Removed empty package

15 years, 6 months

1
0
0 / 0

DNA SVN: r579 - in trunk/extensions/dna-connector-svn/src/test/resources: nodeB and 1 other directory.

by dna-commits＠lists.jboss.org

Author: spagop Date: 2008-10-24 13:18:08 -0400 (Fri, 24 Oct 2008) New Revision: 579 Added: trunk/extensions/dna-connector-svn/src/test/resources/nodeB/ trunk/extensions/dna-connector-svn/src/test/resources/nodeB/JBossORG-EULA.txt Log: nodeB with an item (JBossORG-EULA.txt) Added: trunk/extensions/dna-connector-svn/src/test/resources/nodeB/JBossORG-EULA.txt =================================================================== --- trunk/extensions/dna-connector-svn/src/test/resources/nodeB/JBossORG-EULA.txt (rev 0) +++ trunk/extensions/dna-connector-svn/src/test/resources/nodeB/JBossORG-EULA.txt 2008-10-24 17:18:08 UTC (rev 579) @@ -0,0 +1,104 @@ +LICENSE AGREEMENT +JBOSS(r) + +This License Agreement governs the use of the Software Packages and any updates to the Software +Packages, regardless of the delivery mechanism. Each Software Package is a collective work +under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to +the user ("Client") a license to the applicable collective work(s) pursuant to the +GNU Lesser General Public License v. 2.1 except for the following Software Packages: +(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the +GNU General Public License v.2; + +(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; + +(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the +(open source) Sleepycat License (if Client does not wish to use the open source version of this database, +it may purchase a license from Sleepycat Software); + +and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, +and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various +royalty-free patent licenses. + +Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. + +1. The Software. "Software Packages" refer to the various software modules that are created and made available +for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages +may be comprised of hundreds of software components. The end user license agreement for each component is located in +the component's source code. With the exception of certain image files identified in Section 2 below, +the license terms for the components permit Client to copy, modify, and redistribute the component, +in both source code and binary code forms. This agreement does not limit Client's rights under, +or grant Client rights that supersede, the license terms of any particular component. + +2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright +and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the +individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates +in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages +using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's +trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by +these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. +If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at +http://www.jboss.com/company/logos unless a separate agreement with Red Hat is executed or other permission granted. +Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. + +3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular +component, to the maximum extent permitted under applicable law, the Software Packages and the +components are provided and licensed "as is" without warranty of any kind, expressed or implied, +including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. +Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in +materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. +Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements +or that the operation of the Software Packages will be entirely error free or appear precisely as described +in the accompanying documentation. This warranty extends only to the party that purchases the Services +pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. + +4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies +described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's +exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of +delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or +refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, +Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the use or inability to use the Software, +even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall +Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this +Agreement during the twelve months preceding the action. + +5. Export Control. As required by U.S. law, Client represents and warrants that it: +(a) understands that the Software Packages are subject to export controls under the +U.S. Commerce Department's Export Administration Regulations ("EAR"); + +(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations +(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); + +(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, +or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; + +(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or +biological weapons, or missile technology end-uses unless authorized by the U.S. Government by +regulation or specific license; + +(e) understands and agrees that if it is in the United States and exports or transfers the Software +Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual +reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and +address (including country) of each transferee; + +and (f) understands that countries other than the United States may restrict the import, use, or +export of encryption products and that it shall be solely responsible for compliance with any such +import, use, or export restrictions. + +6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages +that are not part of the Software Packages and which Client must install separately. These third party +programs are subject to their own license terms. The license terms either accompany the programs or +can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable +license terms for such programs, then Client may not install them. If Client wishes to install the programs +on more than one system or transfer the programs to another party, then Client must contact the licensor +of the programs. + +7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the +enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the +State of North Carolina and of the United States, without regard to any conflict of laws provisions, +except that the United Nations Convention on the International Sale of Goods shall not apply. + +Copyright 2006-2007 Red Hat, Inc. All rights reserved. +"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. +All other trademarks are the property of their respective owners.

15 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

dna-commits October 2008