Skip to content
Browse files

Fixed javadoc errors that occurred when moving from Eclipse Helios to…

… Eclipse Indigo. Also fixed a pom error that occurred when upgrading Eclipse.
  • Loading branch information...
1 parent 8fe79c2 commit c02d73479ffd8ddf8479eda28e461227fda3bb25 @elvisisking elvisisking committed
Showing with 92 additions and 61 deletions.
  1. +3 −0 .gitignore
  2. +2 −3 ...em/src/main/java/org/modeshape/jboss/subsystem/AbstractRepositoryConfigWriteAttributeHandler.java
  3. +3 −3 ...sas-subsystem/src/main/java/org/modeshape/jboss/subsystem/BinaryStorageWriteAttributeHandler.java
  4. +3 −3 ...ssas-subsystem/src/main/java/org/modeshape/jboss/subsystem/IndexStorageWriteAttributeHandler.java
  5. +2 −3 ...bossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/RepositoryWriteAttributeHandler.java
  6. +2 −3 ...jbossas-subsystem/src/main/java/org/modeshape/jboss/subsystem/SequencerWriteAttributeHandler.java
  7. +1 −0 ...actors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/TikaTextExtractor.java
  8. +1 −1 extractors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/package-info.java
  9. +1 −1 modeshape-common/src/main/java/org/modeshape/common/collection/ImmutableMapEntry.java
  10. +2 −2 modeshape-jcr/src/main/java/org/modeshape/jcr/NodeTypeSchemata.java
  11. +3 −2 modeshape-jcr/src/main/java/org/modeshape/jcr/query/optimize/RewriteIdentityJoins.java
  12. +5 −5 modeshape-jcr/src/main/java/org/modeshape/jcr/query/parse/BasicSqlQueryParser.java
  13. +2 −3 modeshape-jcr/src/main/java/org/modeshape/jcr/query/plan/PlanNode.java
  14. +6 −5 modeshape-jcr/src/main/java/org/modeshape/jcr/query/xpath/XPathParser.java
  15. +1 −1 modeshape-jcr/src/main/java/org/modeshape/jcr/value/basic/AbstractPath.java
  16. +1 −1 modeshape-jcr/src/main/java/org/modeshape/jcr/value/basic/BasicPathSegment.java
  17. +1 −1 modeshape-jcr/src/main/java/org/modeshape/jcr/value/basic/IdentifierPathSegment.java
  18. +26 −0 modeshape-parent/pom.xml
  19. +4 −3 modeshape-schematic/src/main/java/org/infinispan/schematic/internal/document/BasicArray.java
  20. +6 −6 modeshape-schematic/src/main/java/org/infinispan/schematic/internal/schema/DocumentTransformer.java
  21. +17 −15 sequencers/modeshape-sequencer-ddl/src/main/java/org/modeshape/sequencer/ddl/DdlTokenStream.java
View
3 .gitignore
@@ -32,3 +32,6 @@ ObjectStore
# Presentation Keynote files
/docs/presentations/*.key
+
+# ignore OS X (Mac) files
+.DS_Store
View
5 ...ain/java/org/modeshape/jboss/subsystem/AbstractRepositoryConfigWriteAttributeHandler.java
@@ -36,7 +36,6 @@
import org.jboss.as.controller.OperationStepHandler;
import org.jboss.as.controller.PathAddress;
import org.jboss.as.controller.PathElement;
-import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.as.controller.registry.ManagementResourceRegistration;
import org.jboss.dmr.ModelNode;
import org.jboss.msc.service.ServiceController;
@@ -45,8 +44,8 @@
/**
* An {@link OperationStepHandler} implementation that automatically handles all write-attribute operations against
- * {@link AttributeAccess.Flag#RESTART_NONE RESTART_NONE} {@link AttributeDefinition}s so that the changes are immediately
- * reflected in the repository configuration.
+ * {@link org.jboss.as.controller.registry.AttributeAccess.Flag#RESTART_NONE RESTART_NONE} {@link AttributeDefinition}s so that
+ * the changes are immediately reflected in the repository configuration.
*/
public abstract class AbstractRepositoryConfigWriteAttributeHandler extends AbstractWriteAttributeHandler<Void> {
View
6 ...ystem/src/main/java/org/modeshape/jboss/subsystem/BinaryStorageWriteAttributeHandler.java
@@ -25,13 +25,13 @@
import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.OperationStepHandler;
-import org.jboss.as.controller.registry.AttributeAccess;
/**
* {@link OperationStepHandler} implementations that handles changes to the model values for the binary storage submodel's
* {@link AttributeDefinition attribute definitions}, including the different kinds of binary storage. Those attributes that can
- * be changed {@link AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be immediately reflected in the
- * repository's configuration; other attributes will be changed in the submodel and used upon the next restart.
+ * be changed {@link org.jboss.as.controller.registry.AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be
+ * immediately reflected in the repository's configuration; other attributes will be changed in the submodel and used upon the
+ * next restart.
*/
public class BinaryStorageWriteAttributeHandler extends AbstractRepositoryConfigWriteAttributeHandler {
View
6 ...system/src/main/java/org/modeshape/jboss/subsystem/IndexStorageWriteAttributeHandler.java
@@ -25,13 +25,13 @@
import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.OperationStepHandler;
-import org.jboss.as.controller.registry.AttributeAccess;
/**
* {@link OperationStepHandler} implementations that handles changes to the model values for the index storage submodel's
* {@link AttributeDefinition attribute definitions}, including the different kinds of index storage. Those attributes that can be
- * changed {@link AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be immediately reflected in the
- * repository's configuration; other attributes will be changed in the submodel and used upon the next restart.
+ * changed {@link org.jboss.as.controller.registry.AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be
+ * immediately reflected in the repository's configuration; other attributes will be changed in the submodel and used upon the
+ * next restart.
*/
public class IndexStorageWriteAttributeHandler extends AbstractRepositoryConfigWriteAttributeHandler {
View
5 ...ubsystem/src/main/java/org/modeshape/jboss/subsystem/RepositoryWriteAttributeHandler.java
@@ -25,13 +25,12 @@
import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.OperationStepHandler;
-import org.jboss.as.controller.registry.AttributeAccess;
/**
* An {@link OperationStepHandler} implementation that handles changes to the model values for a repository submodel's
* {@link AttributeDefinition attribute definitions}. Those attributes that can be changed
- * {@link AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be immediately reflected in the repository's
- * configuration; other attributes will be changed in the submodel and used upon the next restart.
+ * {@link org.jboss.as.controller.registry.AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be immediately
+ * reflected in the repository's configuration; other attributes will be changed in the submodel and used upon the next restart.
*/
public class RepositoryWriteAttributeHandler extends AbstractRepositoryConfigWriteAttributeHandler {
View
5 ...subsystem/src/main/java/org/modeshape/jboss/subsystem/SequencerWriteAttributeHandler.java
@@ -31,15 +31,14 @@
import org.jboss.as.controller.OperationStepHandler;
import org.jboss.as.controller.PathAddress;
import org.jboss.as.controller.PathElement;
-import org.jboss.as.controller.registry.AttributeAccess;
import org.jboss.dmr.ModelNode;
import org.modeshape.jboss.service.RepositoryService;
/**
* An {@link OperationStepHandler} implementation that handles changes to the model values for a sequencer submodel's
* {@link AttributeDefinition attribute definitions}. Those attributes that can be changed
- * {@link AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be immediately reflected in the repository's
- * configuration; other attributes will be changed in the submodel and used upon the next restart.
+ * {@link org.jboss.as.controller.registry.AttributeAccess.Flag#RESTART_NONE RESTART_NONE without restarting} will be immediately
+ * reflected in the repository's configuration; other attributes will be changed in the submodel and used upon the next restart.
*/
public class SequencerWriteAttributeHandler extends AbstractRepositoryConfigWriteAttributeHandler {
View
1 ...odeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/TikaTextExtractor.java
@@ -151,6 +151,7 @@ public Object execute( InputStream stream ) throws Exception {
* @param binary a <code>org.modeshape.jcr.api.Binary</code> instance of the content being parsed
* @return a <code>Metadata</code> instance.
* @throws java.io.IOException if auto-detecting the mime-type via Tika fails
+ * @throws RepositoryException if error obtaining MIME-type of the binary parameter
*/
private Metadata prepareMetadata(final Binary binary) throws IOException, RepositoryException {
Metadata metadata = new Metadata();
View
2 ...ors/modeshape-extractor-tika/src/main/java/org/modeshape/extractor/tika/package-info.java
@@ -22,7 +22,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
/**
- * The classes that make up the {@link org.modeshape.graph.text.TextExtractor} implementation that uses the Apache Tika
+ * The classes that make up the {@link org.modeshape.jcr.api.text.TextExtractor} implementation that uses the Apache Tika
* {@link org.apache.tika.parser.Parser} implementations.
*/
View
2 modeshape-common/src/main/java/org/modeshape/common/collection/ImmutableMapEntry.java
@@ -28,7 +28,7 @@
import org.modeshape.common.util.ObjectUtil;
/**
- * An immutable {@link Map.Entry} implementation.
+ * An immutable {@link java.util.Map.Entry} implementation.
*
* @param <K> the key type
* @param <V> the value type
View
4 modeshape-jcr/src/main/java/org/modeshape/jcr/NodeTypeSchemata.java
@@ -58,8 +58,8 @@
/**
* A {@link Schemata} implementation that is constructed from the {@link NodeType}s and {@link PropertyDefinition}s contained
- * within a {@link RepositoryNodeTypeManager}. The resulting {@link Schemata.Table}s will never change, so the
- * {@link RepositoryNodeTypeManager} must replace it's cached instance whenever the node types change.
+ * within a {@link RepositoryNodeTypeManager}. The resulting {@link org.modeshape.jcr.query.validate.Schemata.Table}s will never
+ * change, so the {@link RepositoryNodeTypeManager} must replace it's cached instance whenever the node types change.
*/
@Immutable
public class NodeTypeSchemata implements Schemata {
View
5 modeshape-jcr/src/main/java/org/modeshape/jcr/query/optimize/RewriteIdentityJoins.java
@@ -44,8 +44,9 @@
/**
* An {@link OptimizerRule optimizer rule} that rewrites JOIN nodes that have {@link EquiJoinCondition equi-join criteria} where
- * the columns involved in the equi-join are all identity columns (that is, they form a {@link Schemata.Table#getKeys() key} for
- * the table). This rewrite only happens when the left and right children of the JOIN node are both SOURCE nodes.
+ * the columns involved in the equi-join are all identity columns (that is, they form a
+ * {@link org.modeshape.jcr.query.validate.Schemata.Table#getKeys() key} for the table). This rewrite only happens when the left
+ * and right children of the JOIN node are both SOURCE nodes.
* <p>
* The basic idea is that in these identity equi-join cases, the following structure:
*
View
10 modeshape-jcr/src/main/java/org/modeshape/jcr/query/parse/BasicSqlQueryParser.java
@@ -1535,11 +1535,11 @@ protected Literal literal( TypeSystem typeSystem,
}
/**
- * A {@link TokenStream.Tokenizer} implementation that parses words, quoted phrases, comments, and symbols. Words are
- * delimited by whitespace and consist only of alpha-number characters plus the underscore character. Quoted phrases are
- * delimited by single-quote and double-quote characters (which may be escaped within the quote). Comments are the characters
- * starting with '/*' and ending with '&#42;/', or starting with '--' and ending with the next line terminator (or the end of
- * the content).
+ * A {@link org.modeshape.common.text.TokenStream.Tokenizer} implementation that parses words, quoted phrases, comments, and
+ * symbols. Words are delimited by whitespace and consist only of alpha-number characters plus the underscore character.
+ * Quoted phrases are delimited by single-quote and double-quote characters (which may be escaped within the quote). Comments
+ * are the characters starting with '/*' and ending with '&#42;/', or starting with '--' and ending with the next line
+ * terminator (or the end of the content).
*/
public static class SqlTokenizer implements TokenStream.Tokenizer {
/**
View
5 modeshape-jcr/src/main/java/org/modeshape/jcr/query/plan/PlanNode.java
@@ -47,7 +47,6 @@
import org.modeshape.jcr.query.model.SetQuery.Operation;
import org.modeshape.jcr.query.model.Visitable;
import org.modeshape.jcr.query.model.Visitors;
-import org.modeshape.jcr.query.validate.Schemata;
/**
* A representation of a single node within a plan tree.
@@ -166,8 +165,8 @@ public static Type forSymbol( String symbol ) {
/** For SOURCE nodes, the alias name of the selector. Value is a {@link SelectorName} object. */
SOURCE_ALIAS,
/**
- * For SOURCE nodes, the collection of columns that are available. Value is a Collection of {@link Schemata.Column}
- * objects.
+ * For SOURCE nodes, the collection of columns that are available. Value is a Collection of
+ * {@link org.modeshape.jcr.query.validate.Schemata.Column} objects.
*/
SOURCE_COLUMNS,
View
11 modeshape-jcr/src/main/java/org/modeshape/jcr/query/xpath/XPathParser.java
@@ -727,11 +727,12 @@ protected Component collapse( Component component ) {
}
/**
- * A {@link TokenStream.Tokenizer} implementation that parses single- and double-quoted strings, symbols, words consisting of
- * {@link TokenStream.CharacterStream#isNextValidXmlNcNameCharacter() NCName}s (as defined by the <a
- * href="http://www.w3.org/TR/REC-xml-names/#NT-NCName">Namespaces in XML 1.0</a> specification), XPath comments,and
- * {@link #OTHER other} single-character tokens. Quoted phrases are delimited by single-quote and double-quote characters
- * (which may be escaped within the quote). XPath comments begin with a "(:" and end with a ":)".
+ * A {@link org.modeshape.common.text.TokenStream.Tokenizer} implementation that parses single- and double-quoted strings,
+ * symbols, words consisting of {@link org.modeshape.common.text.TokenStream.CharacterStream#isNextValidXmlNcNameCharacter()
+ * NCName}s (as defined by the <a href="http://www.w3.org/TR/REC-xml-names/#NT-NCName">Namespaces in XML 1.0</a>
+ * specification), XPath comments,and {@link #OTHER other} single-character tokens. Quoted phrases are delimited by
+ * single-quote and double-quote characters (which may be escaped within the quote). XPath comments begin with a "(:" and end
+ * with a ":)".
*/
public static class XPathTokenizer implements TokenStream.Tokenizer {
/**
View
2 modeshape-jcr/src/main/java/org/modeshape/jcr/value/basic/AbstractPath.java
@@ -43,7 +43,7 @@
/**
* An abstract foundation for different {@link Path} implementations. This class does not manage any of the {@link Path}'s state,
* but it does provide implementations for most of the methods based upon a few abstract methods. For example, any implementaton
- * that requires the {@link Path.Segment path's segments} are written to use the {@link #iterator()}, since that is likely more
+ * that requires the {@link org.modeshape.jcr.value.Path.Segment path's segments} are written to use the {@link #iterator()}, since that is likely more
* efficient for the majority of implementations.
*/
@Immutable
View
2 modeshape-jcr/src/main/java/org/modeshape/jcr/value/basic/BasicPathSegment.java
@@ -31,7 +31,7 @@
import org.modeshape.jcr.value.Path;
/**
- * A basic implementation of {@link Path.Segment}.
+ * A basic implementation of {@link org.modeshape.jcr.value.Path.Segment}.
*/
@Immutable
public class BasicPathSegment implements Path.Segment {
View
2 modeshape-jcr/src/main/java/org/modeshape/jcr/value/basic/IdentifierPathSegment.java
@@ -30,7 +30,7 @@
import org.modeshape.jcr.value.Path;
/**
- * A {@link Path.Segment} implementation that represents an identifier segment.
+ * A {@link org.modeshape.jcr.value.Path.Segment} implementation that represents an identifier segment.
*/
@Immutable
public class IdentifierPathSegment extends BasicPathSegment {
View
26 modeshape-parent/pom.xml
@@ -497,6 +497,32 @@
</configuration>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <!-- copy-dependency plugin -->
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
View
7 modeshape-schematic/src/main/java/org/infinispan/schematic/internal/document/BasicArray.java
@@ -53,9 +53,10 @@
import org.infinispan.schematic.internal.schema.DocumentTransformer.SystemPropertiesTransformer;
/**
- * A {@link Bson.Type#ARRAY ordered array of values} for use as a value within a {@link Document BSON Object}. Instances of this
- * type are designed to be unmodifiable from a client's perspective, since clients always modify the instances using an editor.
- * There are several <code>internal*</code> methods that do modify the contents, but these may not be used by client applications.
+ * A {@link org.infinispan.schematic.document.Bson.Type#ARRAY ordered array of values} for use as a value within a
+ * {@link Document BSON Object}. Instances of this type are designed to be unmodifiable from a client's perspective, since clients
+ * always modify the instances using an editor. There are several <code>internal*</code> methods that do modify the contents, but
+ * these may not be used by client applications.
* <p>
* Since BSON and JSON documents can be simple arrays of values, this class implements the {@link Document} interface, where the
* object's names are expected to be string values of integer indexes. This class also implements {@link List} interface, but only
View
12 ...schematic/src/main/java/org/infinispan/schematic/internal/schema/DocumentTransformer.java
@@ -187,9 +187,9 @@ public static String getSubstitutedProperty( String value,
}
/**
- * An implementation of {@link Document.ValueTransformer} that replaces variables in the field values with values from the
- * system properties. Only string values are considered, since other types cannot contain variables (and since the
- * transformers are never called on Document or List values).
+ * An implementation of {@link org.infinispan.schematic.document.Document.ValueTransformer} that replaces variables in the
+ * field values with values from the system properties. Only string values are considered, since other types cannot contain
+ * variables (and since the transformers are never called on Document or List values).
* <p>
* Variables may appear anywhere within a string value, and multiple variables can be used within the same value. Variables
* take the form:
@@ -232,9 +232,9 @@ public Object transform( String name,
}
/**
- * An implementation of {@link Document.ValueTransformer} that replaces variables in the field values with values from the
- * system properties. Only string values are considered, since other types cannot contain variables (and since the
- * transformers are never called on Document or List values).
+ * An implementation of {@link org.infinispan.schematic.document.Document.ValueTransformer} that replaces variables in the
+ * field values with values from the system properties. Only string values are considered, since other types cannot contain
+ * variables (and since the transformers are never called on Document or List values).
* <p>
* Variables may appear anywhere within a string value, and multiple variables can be used within the same value. Variables
* take the form:
View
32 ...ers/modeshape-sequencer-ddl/src/main/java/org/modeshape/sequencer/ddl/DdlTokenStream.java
@@ -256,41 +256,42 @@ public static DdlTokenizer ddlTokenizer( boolean includeComments ) {
public static final String PARSER_ID = "PARSER_ID";
/**
- * The {@link TokenStream.Token#type() token type} for tokens that represent an unquoted string containing a character
- * sequence made up of non-whitespace and non-symbol characters.
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that represent an unquoted string
+ * containing a character sequence made up of non-whitespace and non-symbol characters.
*/
public static final int WORD = 1;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that consist of an individual "symbol" character. The set of
- * characters includes: <code>-(){}*,;+%?$[]!<>|=:</code>
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that consist of an individual
+ * "symbol" character. The set of characters includes: <code>-(){}*,;+%?$[]!<>|=:</code>
*/
public static final int SYMBOL = 2;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that consist of an individual '.' character.
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that consist of an individual '.'
+ * character.
*/
public static final int DECIMAL = 4;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that consist of all the characters within single-quotes.
- * Single quote characters are included if they are preceded (escaped) by a '\' character.
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that consist of all the characters
+ * within single-quotes. Single quote characters are included if they are preceded (escaped) by a '\' character.
*/
public static final int SINGLE_QUOTED_STRING = 8;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that consist of all the characters within double-quotes.
- * Double quote characters are included if they are preceded (escaped) by a '\' character.
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that consist of all the characters
+ * within double-quotes. Double quote characters are included if they are preceded (escaped) by a '\' character.
*/
public static final int DOUBLE_QUOTED_STRING = 16;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that consist of all the characters between "/*" and
- * "&#42;/", between "//" and the next line terminator (e.g., '\n', '\r' or "\r\n"), or between "--" and the next line
- * terminator (e.g., '\n', '\r' or "\r\n").
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that consist of all the characters
+ * between "/*" and "&#42;/", between "//" and the next line terminator (e.g., '\n', '\r' or "\r\n"), or between "--" and
+ * the next line terminator (e.g., '\n', '\r' or "\r\n").
*/
public static final int COMMENT = 32;
private final boolean useComments;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that represent key words or reserved words for a given DDL
- * dialect.
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that represent key words or
+ * reserved words for a given DDL dialect.
* <p>
* Examples would be: "CREATE", "TABLE", "ALTER", "SCHEMA", "DROP", etc...
* </p>
@@ -299,7 +300,8 @@ public static DdlTokenizer ddlTokenizer( boolean includeComments ) {
public static final int KEYWORD = 64;
/**
- * The {@link TokenStream.Token#type() token type} for tokens that represent the start of a DDL statement.
+ * The {@link org.modeshape.common.text.TokenStream.Token#type() token type} for tokens that represent the start of a DDL
+ * statement.
* <p>
* Examples would be: {"CREATE", "TABLE"} {"CREATE", "OR", "REPLACE", "VIEW"}
* </p>

0 comments on commit c02d734

Please sign in to comment.
Something went wrong with that request. Please try again.