Author: bimargulies
Date: Thu Dec 4 10:26:42 2008
New Revision: 723390
URL: http://svn.apache.org/viewvc?rev=723390&view=rev
Log:
Remove javadoc warnings.
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml?rev=723390&r1=723389&r2=723390&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml
(original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/pom.xml Thu Dec
4 10:26:42 2008
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -71,20 +71,6 @@
</testResource>
</testResources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0</version>
@@ -126,89 +112,95 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- <configuration>
-
<tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/XmlSchema</tagBase>
- <useReleaseProfiles>false</useReleaseProfiles>
- <goals>deploy</goals>
- <arguments>-Prelease</arguments>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.3</source>
- <target>1.3</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <include>**/Test*.java</include>
-<!--
- Fails in about half of
the tests
-
<include>tests/w3c/TestW3CSchemaBucket.java</include>
- -->
- </includes>
- <excludes>
- <exclude>tests/w3c/**.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- <descriptor>src/main/assembly/doc.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>site</id>
- <phase>package</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>single</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
</plugins>
<defaultGoal>install</defaultGoal>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-scm-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ <configuration>
+
<tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/XmlSchema</tagBase>
+ <useReleaseProfiles>false</useReleaseProfiles>
+ <goals>deploy</goals>
+ <arguments>-Prelease</arguments>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/Test*.java</include>
+ <!--
+ Fails in about half of the tests
+
<include>tests/w3c/TestW3CSchemaBucket.java</include>
+ -->
+ </includes>
+ <excludes>
+ <exclude>tests/w3c/**.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/doc.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site</id>
+ <phase>package</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<profiles>
<profile>
@@ -243,7 +235,7 @@
<executions>
<execution>
<id>site</id>
- <phase>package</phase>
+ <phase>validate</phase>
<goals>
<goal>site</goal>
</goals>
@@ -298,6 +290,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>single</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchema.java?rev=723390&r1=723389&r2=723390&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
Thu Dec 4 10:26:42 2008
@@ -254,7 +254,7 @@
* get an element by the name in the local schema
*
* @param name
- * @return
+ * @return the element.
*/
public XmlSchemaElement getElementByName(String name) {
QName nameToSearchFor = new QName(this.getTargetNamespace(),name);
@@ -264,7 +264,7 @@
/**
* Look for a element by its qname. Searches through all the schemas
* @param name
- * @return
+ * @return the element.
*/
public XmlSchemaElement getElementByName(QName name) {
return this.getElementByName(name, true, null);
@@ -273,19 +273,20 @@
/**
* Look for a global attribute by its QName. Searches through all
schemas.
* @param name
- * @return
+ * @return the attribute.
*/
public XmlSchemaAttribute getAttributeByName(QName name) {
return this.getAttributeByName(name, true, null);
}
/**
- * protected method that allows safe (non-recursive schema loading)
- *
+ * Protected method that allows safe (non-recursive schema loading). It
looks for a type
+ * with constraints.
+ *
* @param name
* @param deep
* @param schemaStack
- * @return
+ * @return the type.
*/
protected XmlSchemaType getTypeByName(QName name, boolean deep,
Stack schemaStack) {
@@ -328,18 +329,18 @@
/**
* Search this schema and all the imported/included ones
- * for the given Qname
+ * for the given Qname
* @param name
- * @return
+ * @return the type.
*/
public XmlSchemaType getTypeByName(QName name) {
return getTypeByName(name, true, null);
}
/**
- *
+ * Search this schema for a type by qname.
* @param name
- * @return
+ * @return the type.
*/
public XmlSchemaType getTypeByName(String name) {
QName nameToSearchFor = new QName(this.getTargetNamespace(),name);
@@ -350,7 +351,7 @@
* Get a schema from an import
*
* @param includeOrImport
- * @return
+ * @return return the schema object.
*/
private XmlSchema getSchema(Object includeOrImport) {
XmlSchema schema;
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=723390&r1=723389&r2=723390&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
Thu Dec 4 10:26:42 2008
@@ -544,7 +544,7 @@
/**
* Return the schema from this collection for a particular targetNamespace.
* @param uri target namespace URI.
- * @return
+ * @return the schema.
*/
public XmlSchema schemaForNamespace(String uri) {
for (Iterator iter = schemas.entrySet().iterator(); iter.hasNext();
) {
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
URL:
http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java?rev=723390&r1=723389&r2=723390&view=diff
==============================================================================
---
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
(original)
+++
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
Thu Dec 4 10:26:42 2008
@@ -594,7 +594,7 @@
* call getInputEncoding hence it returns the correct value
* only if a DOM3 API is used. Otherwise it returns the default encoding
* @param doc
- * @return
+ * @return the encoding (e.g. UTF-8)
*/
public static String getInputEncoding(Document doc) {
try {
@@ -611,7 +611,7 @@
* only if a DOM3 API is used. Otherwise it returns the default encoding
* @see #getInputEncoding(Document)
* @param doc
- * @return
+ * @return the encoding (e.g. utf-8).
*/
public static String getXmlEncoding(Document doc) {
try {
