You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by bi...@apache.org on 2008/12/06 02:09:02 UTC
svn commit: r723939 - in /webservices/commons/trunk/modules/XmlSchema: ./
legal/ src/main/appended-resources/ src/main/appended-resources/META-INF/
src/main/assembly/ src/main/java/org/apache/ws/commons/schema/
src/main/java/org/apache/ws/commons/schem...
Author: bimargulies
Date: Fri Dec 5 17:09:01 2008
New Revision: 723939
URL: http://svn.apache.org/viewvc?rev=723939&view=rev
Log:
Merged revisions 722074,722175,722227,722306,722310-722311,722313-722314,722316,723379,723383,723387,723390,723923,723930,723932 via svnmerge from
https://svn.apache.org/repos/asf/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH
........
r722074 | bimargulies | 2008-12-01 08:49:47 -0500 (Mon, 01 Dec 2008) | 2 lines
Release prep: set version 1.4.3 in harmless locations.
........
r722175 | bimargulies | 2008-12-01 13:51:10 -0500 (Mon, 01 Dec 2008) | 2 lines
Update POM to use the 'standard' maven process for staging releases for a vote.
........
r722227 | bimargulies | 2008-12-01 15:57:47 -0500 (Mon, 01 Dec 2008) | 2 lines
Fix typo.
........
r722306 | bimargulies | 2008-12-01 19:04:56 -0500 (Mon, 01 Dec 2008) | 2 lines
Write release notes for 1.4.3.
........
r722310 | bimargulies | 2008-12-01 19:23:26 -0500 (Mon, 01 Dec 2008) | 2 lines
Clean up some white space, maybe that will fix the release system.
........
r722311 | bimargulies | 2008-12-01 19:28:53 -0500 (Mon, 01 Dec 2008) | 2 lines
Update scm plugin to dodge MacOS bug?
........
r722313 | bimargulies | 2008-12-01 19:41:29 -0500 (Mon, 01 Dec 2008) | 2 lines
Update release plugin.
........
r722314 | bimargulies | 2008-12-01 19:42:44 -0500 (Mon, 01 Dec 2008) | 1 line
[maven-release-plugin] prepare release XmlSchema-1.4.3
........
r722316 | bimargulies | 2008-12-01 19:42:52 -0500 (Mon, 01 Dec 2008) | 1 line
[maven-release-plugin] prepare for next development iteration
........
r723379 | bimargulies | 2008-12-04 12:24:15 -0500 (Thu, 04 Dec 2008) | 2 lines
Address WSCOMMONS-407.
........
r723383 | bimargulies | 2008-12-04 12:53:56 -0500 (Thu, 04 Dec 2008) | 2 lines
WSCOMMONS-410, except that some of it might be missing.
........
r723387 | bimargulies | 2008-12-04 13:05:18 -0500 (Thu, 04 Dec 2008) | 2 lines
Keep trying to get the pom right.
........
r723390 | bimargulies | 2008-12-04 13:26:42 -0500 (Thu, 04 Dec 2008) | 2 lines
Remove javadoc warnings.
........
r723923 | bimargulies | 2008-12-05 18:30:29 -0500 (Fri, 05 Dec 2008) | 2 lines
WSCOMMONS-411. Add accessors to allow more selective serialization.
........
r723930 | bimargulies | 2008-12-05 19:04:37 -0500 (Fri, 05 Dec 2008) | 1 line
[maven-release-plugin] prepare release XmlSchema-1.4.3
........
r723932 | bimargulies | 2008-12-05 19:04:45 -0500 (Fri, 05 Dec 2008) | 1 line
[maven-release-plugin] prepare for next development iteration
........
Added:
webservices/commons/trunk/modules/XmlSchema/src/main/appended-resources/
- copied from r723932, webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/appended-resources/
webservices/commons/trunk/modules/XmlSchema/src/main/appended-resources/META-INF/
- copied from r723932, webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/appended-resources/META-INF/
webservices/commons/trunk/modules/XmlSchema/src/main/appended-resources/META-INF/NOTICE
- copied unchanged from r723932, webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/appended-resources/META-INF/NOTICE
Removed:
webservices/commons/trunk/modules/XmlSchema/legal/
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/filter.properties
webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/LICENSE.txt
webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/NOTICE.txt
Modified:
webservices/commons/trunk/modules/XmlSchema/ (props changed)
webservices/commons/trunk/modules/XmlSchema/RELEASE-NOTE.txt
webservices/commons/trunk/modules/XmlSchema/pom.xml
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/doc.xml
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/MANIFEST.MF
Propchange: webservices/commons/trunk/modules/XmlSchema/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec 5 17:09:01 2008
@@ -1 +1 @@
-/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:1-718348
+/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH:1-723938
Modified: webservices/commons/trunk/modules/XmlSchema/RELEASE-NOTE.txt
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/RELEASE-NOTE.txt?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/RELEASE-NOTE.txt (original)
+++ webservices/commons/trunk/modules/XmlSchema/RELEASE-NOTE.txt Fri Dec 5 17:09:01 2008
@@ -2,27 +2,26 @@
XMLSchema ${version} Release Notes
====================================
-This is the release of XMLSchema ${version} of Apache WS-Commons. This release includes
-numerous bug fixes and a new feature addition that enables users to register
-extension types with the schema parser.
+This is the release of XMLSchema ${version} of Apache WS-Commons.
XMLSchema is a lightweight schema object model that can be used to manipulate
-and generate XML schema representations. It has no external dependencies
+and generate XML schema representations. It has few external dependencies
and can be easily integrated into an existing project.
-You are welcome to kick the tires and get XMLSchema on the move. If you like
-to help us shape XMLSchema any contribution in the form of coding, testing,
-submitting improvements to the documentation, and reporting bugs are always
-welcome.
-
-Major Changes since the last release
-
- * The behavior of the getElementByName(QName name) and getTypeByName(QName name) has
- changed. Now this method triggers a search in the complete schema tree (including imported and
- included schemas) for the specified type.
- * Two new methods have been added etElementByName(String name) and getTypeByName(String name) which
- would perform the search only in the current schema.
-
+You are welcome to kick the tires and get XMLSchema on the move. Any
+contribution in the form of coding, testing, submitting improvements
+to the documentation, and reporting bugs are always welcome.
+
+This release fixes the following defects:
+
+WSCOMMONS-401 Add support for CDATA in XmlSchemaDocumentation
+WSCOMMONS-396 API lacks functions for global attributes like those for types and elements
+WSCOMMONS-364 Add getter for schemaResolve
+WSCOMMONS-361 Performance enhancement for build from DOM
+WSCOMMONS-358 DOM level 3 checks don't work properly
+WSCOMMONS-355 xsd:anySimpleType missing from http://www.w3.org/2001/XMLSchema
+
Thanks for your interest in XMLSchema!
-- The XMLSchema Development Team
+- The XMLSchema Development Team (commons-dev@ws.apache.org)
+
Modified: webservices/commons/trunk/modules/XmlSchema/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/pom.xml?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/pom.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/pom.xml Fri Dec 5 17:09:01 2008
@@ -1,403 +1,491 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ 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
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ws.commons.schema</groupId>
- <artifactId>XmlSchema</artifactId>
- <name>XmlSchema</name>
- <version>1.4-SNAPSHOT</version>
- <description>Commons XMLSchema is a light weight schema object model that can be used to manipualte or
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ 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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ws.commons.schema</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <name>XmlSchema</name>
+ <version>1.4-SNAPSHOT</version>
+ <description>Commons XMLSchema is a light weight schema object model that can be used to manipulate or
generate a schema. It has a clean, easy to use API and can easily be integrated into an existing project
since it has almost no dependencies on third party libraries.</description>
- <url>http://ws.apache.org/commons/XmlSchema</url>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/WSCOMMONS</url>
- </issueManagement>
- <ciManagement>
- <system>Continuum</system>
- <url>unknown</url>
- <notifiers>
- <notifier>
- <sendOnError>false</sendOnError>
- <sendOnFailure>false</sendOnFailure>
- <sendOnSuccess>false</sendOnSuccess>
- <sendOnWarning>false</sendOnWarning>
+ <url>http://ws.apache.org/commons/XmlSchema</url>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://issues.apache.org/jira/browse/WSCOMMONS</url>
+ </issueManagement>
+ <mailingLists>
+ <mailingList>
+ <name>WS Commons Developers</name>
+ <subscribe>commons-dev-subscribe@ws.apache.org</subscribe>
+ <unsubscribe>commons-dev-unsubscribe@ws.apache.org</unsubscribe>
+ <post>commons-dev@ws.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/ws-commons-dev/</archive>
+ </mailingList>
+ </mailingLists>
+ <inceptionYear>2004</inceptionYear>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH</developerConnection>
+ <url>http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH</url>
+ </scm>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <build>
+ <!-- adding relevant resources to the jar files -->
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/test-resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
<configuration>
- <address>commons-dev@ws.apache.org</address>
+ <resourceBundles>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <projectName>Apache WebServices - XmlSchema</projectName>
+ </properties>
</configuration>
- </notifier>
- </notifiers>
- </ciManagement>
- <mailingLists>
- <mailingList>
- <name>WS Commons Developers</name>
- <subscribe>commons-dev-subscribe@ws.apache.org</subscribe>
- <unsubscribe>commons-dev-unsubscribe@ws.apache.org</unsubscribe>
- <post>commons-dev@ws.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/ws-commons-dev/</archive>
- </mailingList>
- </mailingLists>
- <inceptionYear>2004</inceptionYear>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/XmlSchema</connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/XmlSchema</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema</url>
- </scm>
- <organization>
- <name>The Apache Software Foundation</name>
- <url>http://www.apache.org/</url>
- </organization>
- <build>
-
-
- <!-- this entry here is for the assembly plugin- For some reason
- the assembly plugin cannot override the filter properties (as explained
- in the docs) and also does not inherit the maven standard properties. This
- is the one that points to a seperare filter props file -->
- <filters>
- <filter>src/main/assembly/filter.properties</filter>
- </filters>
-
- <!-- adding relevant resources to the jar files -->
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/test-resources</directory>
- </testResource>
- </testResources>
-
-
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>prepareNistTest</id>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant inheritRefs="true" antfile="${basedir}/build.xml">
+ <property value="${basedir}/target" name="build.dir" />
+ <property value="${maven.test.skip}" name="maven.test.skip" />
+ <target name="prepareNistTest" />
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </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>
+ <id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ <value />
+ </property>
+ </activation>
+ <build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>prepareNistTest</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant inheritRefs="true" antfile="${basedir}/build.xml">
- <property value="${basedir}/target" name="build.dir"></property>
- <property value="${maven.test.skip}" name="maven.test.skip"></property>
- <target name="prepareNistTest"></target>
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/XmlSchema</tagBase>
- </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-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
-
+<!--
+ We want to sign the artifact, the POM, and all attached artifacts
+-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+<!--
+ We want to deploy the artifact to a staging location for perusal
+-->
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>site</id>
+ <phase>validate</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>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <attach>true</attach>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</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>
</plugins>
- <defaultGoal>install</defaultGoal>
- </build>
- <profiles>
- <profile>
- <id>release</id>
- <activation>
- <property>
- <name>release</name>
- <value></value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>DefaultTest</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <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>
- <systemProperties>
- <!-- The default xalan TransformerFactory on the ibm jdk is
- org.apache.xalan.processor.TransformerFactoryImpl which
- has a known issue with implicit namespaces. Set this
- property to use the xsltc TransformerFactory (which
- the sun jdk seems to default to).
- -->
- <!-- <property>
- <name>javax.xml.transform.TransformerFactory</name>
- <value>com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl</value>
- </property> -->
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>IBMTest</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>IBM Corporation</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.bcel</groupId>
- <artifactId>bcel</artifactId>
- <version>5.2</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <!-- Fails in about half of the tests
- <include>tests/w3c/TestW3CSchemaBucket.java</include>
- -->
- </includes>
- <excludes>
- <exclude>
- tests/w3c/SchemaTest.java
+ </build>
+ </profile>
+ <profile>
+ <id>DefaultTest</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <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>
- <systemProperties>
- <!-- The default xalan TransformerFactory on the ibm jdk is
- org.apache.xalan.processor.TransformerFactoryImpl which
- has a known issue with implicit namespaces. Set this
- property to use the xsltc TransformerFactory (which
- the sun jdk seems to default to).
- -->
- <property>
- <name>
- javax.xml.transform.TransformerFactory
- </name>
- <value>
- org.apache.xalan.xsltc.trax.TransformerFactoryImpl
- </value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <pluginRepositories>
- <pluginRepository>
- <id>snapshot</id>
- <name>Snapshot repository</name>
- <url>http://snapshots.maven.codehaus.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>snapshot-apache</id>
- <name>Apache Snapshot repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
+ </excludes>
+ <systemProperties>
+<!--
+ The default xalan TransformerFactory on the ibm jdk is
+ org.apache.xalan.processor.TransformerFactoryImpl which has a
+ known issue with implicit namespaces. Set this property to use
+ the xsltc TransformerFactory (which the sun jdk seems to
+ default to).
+ -->
+<!--
+ <property> <name>javax.xml.transform.TransformerFactory</name>
+ <value>com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl</value>
+ </property>
+ -->
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>IBMTest</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>IBM Corporation</value>
+ </property>
+ </activation>
+ <dependencies>
<dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.1</version>
- <scope>test</scope>
+ <groupId>org.apache.bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>5.2</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons</groupId>
- <artifactId>ws-commons-java5</artifactId>
- <version>1.0.1</version>
- <optional>true</optional>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
</dependency>
- </dependencies>
- <reporting>
+ </dependencies>
+ <build>
<plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+<!--
+ Fails in about half of the tests
+ <include>tests/w3c/TestW3CSchemaBucket.java</include>
+ -->
+ </includes>
+ <excludes>
+ <exclude>
+ tests/w3c/SchemaTest.java
+ </exclude>
+ </excludes>
+ <systemProperties>
+<!--
+ The default xalan TransformerFactory on the ibm jdk is
+ org.apache.xalan.processor.TransformerFactoryImpl which has a
+ known issue with implicit namespaces. Set this property to use
+ the xsltc TransformerFactory (which the sun jdk seems to
+ default to).
+ -->
+ <property>
+ <name>
+ javax.xml.transform.TransformerFactory
+ </name>
+ <value>
+ org.apache.xalan.xsltc.trax.TransformerFactoryImpl
+ </value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
- </reporting>
- <distributionManagement>
- <repository>
- <id>apache-repo</id>
- <name>Maven Central Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- </repository>
- <snapshotRepository>
- <id>apache-snapshots</id>
- <name>Apache Development Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- <uniqueVersion>false</uniqueVersion>
- </snapshotRepository>
- <site>
- <id>website</id>
- <url>scpexe://people.apache.org/www/ws.apache.org/commons/XmlSchema</url>
- </site>
- </distributionManagement>
- <properties>
- <!-- should the osgi version be the same as the artifact id ?? -->
- <xmlschema.osgi.version>1.4</xmlschema.osgi.version>
- <bundle.plugin.version>1.4.0</bundle.plugin.version>
- </properties>
+ </build>
+ </profile>
+ </profiles>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>snapshot</id>
+ <name>Snapshot repository</name>
+ <url>http://snapshots.maven.codehaus.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>snapshot-apache</id>
+ <name>Apache Snapshot repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons</groupId>
+ <artifactId>ws-commons-java5</artifactId>
+ <version>1.0.1</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <repository>
+ <id>apache-repo</id>
+ <name>Maven Central Repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+ </repository>
+ <snapshotRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Development Repository</name>
+ <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
+ <uniqueVersion>false</uniqueVersion>
+ </snapshotRepository>
+ <site>
+ <id>website</id>
+ <url>scpexe://people.apache.org/www/ws.apache.org/commons/XmlSchema</url>
+ </site>
+ </distributionManagement>
</project>
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml Fri Dec 5 17:09:01 2008
@@ -1,51 +1,62 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ 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
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<assembly>
- <id>bin</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeSiteDirectory>false</includeSiteDirectory>
- <fileSets>
- <fileSet>
- <includes>
- <include>*.txt</include>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ 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
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ <format>dir</format>
+ </formats>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.txt</include>
</includes>
<!-- Note that we exclude these txt files and later copy them with
filteres -->
<excludes>
<exclude>README.txt</exclude>
<exclude>RELEASE-NOTE.txt</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- <!-- exclude sources -->
- <excludes>
- <exclude>*-sources.jar</exclude>
- </excludes>
- </fileSet>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ <!-- exclude sources -->
+ <excludes>
+ <exclude>*-sources.jar</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
<files>
<file>
@@ -58,10 +69,10 @@
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
</file>
- </files>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- </dependencySet>
- </dependencySets>
-</assembly>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/assembly/doc.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/assembly/doc.xml?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/assembly/doc.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/assembly/doc.xml Fri Dec 5 17:09:01 2008
@@ -21,6 +21,7 @@
<id>docs</id>
<formats>
<format>zip</format>
+ <format>dir</format>
</formats>
<includeSiteDirectory>true</includeSiteDirectory>
<fileSets>
@@ -28,6 +29,33 @@
<includes>
<include>*.txt</include>
</includes>
+ <excludes>
+ <exclude>README.txt</exclude>
+ <exclude>RELEASE-NOTE.txt</exclude>
+ </excludes>
</fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>README.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>RELEASE-NOTE.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
+
</assembly>
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml Fri Dec 5 17:09:01 2008
@@ -21,6 +21,7 @@
<id>src</id>
<formats>
<format>zip</format>
+ <format>dir</format>
</formats>
<fileSets>
<fileSet>
@@ -36,9 +37,19 @@
<exclude>RELEASE-NOTE.txt</exclude>
</excludes>
</fileSet>
- <fileSet>
+ <fileSet>
<directory>src</directory>
</fileSet>
+ <fileSet>
+ <directory>target/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <excludes>
+ <exclude>DEPENDENCIES</exclude>
+ </excludes>
+ </fileSet>
</fileSets>
<files>
<file>
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchema.java Fri Dec 5 17:09:01 2008
@@ -19,6 +19,7 @@
package org.apache.ws.commons.schema;
+import org.apache.ws.commons.schema.XmlSchemaSerializer.XmlSchemaSerializerException;
import org.apache.ws.commons.schema.constants.Constants;
import org.apache.ws.commons.schema.utils.NamespaceContextOwner;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
@@ -34,23 +35,21 @@
import java.util.Iterator;
import java.util.Stack;
-
+// Ancient history, year unknown:-)
+//Oct 15th - momo - initial impl
+//Oct 17th - vidyanand - add SimpleType + element
+//Oct 18th - momo - add ComplexType
+//Oct 19th - vidyanand - handle external
+//Dec 6th - Vidyanand - changed RuntimeExceptions thrown to XmlSchemaExceptions
+//Jan 15th - Vidyanand - made changes to SchemaBuilder.handleElement to look for an element ref.
+//Feb 20th - Joni - Change the getXmlSchemaFromLocation schema
+// variable to name s.
+//Feb 21th - Joni - Port to XMLDomUtil and Tranformation.
/**
* Contains the definition of a schema. All XML Schema definition language (XSD)
* elements are children of the schema element. Represents the World Wide Web
* Consortium (W3C) schema element
*/
-
-// Oct 15th - momo - initial impl
-// Oct 17th - vidyanand - add SimpleType + element
-// Oct 18th - momo - add ComplexType
-// Oct 19th - vidyanand - handle external
-// Dec 6th - Vidyanand - changed RuntimeExceptions thrown to XmlSchemaExceptions
-// Jan 15th - Vidyanand - made changes to SchemaBuilder.handleElement to look for an element ref.
-// Feb 20th - Joni - Change the getXmlSchemaFromLocation schema
-// variable to name s.
-// Feb 21th - Joni - Port to XMLDomUtil and Tranformation.
-
public class XmlSchema extends XmlSchemaAnnotated implements NamespaceContextOwner {
private static final String UTF_8_ENCODING = "UTF-8";
static final String SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
@@ -254,7 +253,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 +263,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 +272,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 +328,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 +350,7 @@
* Get a schema from an import
*
* @param includeOrImport
- * @return
+ * @return return the schema object.
*/
private XmlSchema getSchema(Object includeOrImport) {
XmlSchema schema;
@@ -625,11 +625,24 @@
return true;
}
+
+ /**
+ * Retrieve a DOM tree for this one schema, independent of any included or
+ * related schemas.
+ * @return The DOM document.
+ * @throws XmlSchemaSerializerException
+ */
+ public Document getSchemaDocument() throws XmlSchemaSerializerException {
+ XmlSchemaSerializer xser = new XmlSchemaSerializer();
+ xser.setExtReg(this.parent.getExtReg());
+ return xser.serializeSchema(this, false)[0];
+ }
+
public String getInputEncoding() {
return inputEncoding;
}
- public String toString() {
+ public String toString() {
return super.toString() + "[" + logicalTargetNamespace + "]";
}
}
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaCollection.java Fri Dec 5 17:09:01 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/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/XmlSchemaSerializer.java Fri Dec 5 17:09:01 2008
@@ -19,28 +19,54 @@
package org.apache.ws.commons.schema;
-import org.apache.ws.commons.schema.constants.Constants;
-import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
-import org.apache.ws.commons.schema.utils.NamespacePrefixList;
-import org.w3c.dom.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import java.util.*;
-public class XmlSchemaSerializer {
+import org.apache.ws.commons.schema.constants.Constants;
+import org.apache.ws.commons.schema.extensions.ExtensionRegistry;
+import org.apache.ws.commons.schema.utils.NamespacePrefixList;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
+
+/**
+ * Convert from the XML Schema class representation to the standard
+ * XML representation.
+ */
+public class XmlSchemaSerializer {
+
/**
* Extension registry for the serializer
- * */
+ */
private ExtensionRegistry extReg;
+ /**
+ * Get the registry of extensions for this serializer.
+ * @return the registry.
+ */
public ExtensionRegistry getExtReg() {
return extReg;
}
+ /**
+ * Set the registry of extensions for this serializer.
+ * @param extReg the registry.
+ */
public void setExtReg(ExtensionRegistry extReg) {
this.extReg = extReg;
}
@@ -55,28 +81,22 @@
private static final String XMLNS_NAMESPACE_URI = "http://www.w3.org/2000/xmlns/";
- XmlSchemaSerializer() {
+ /**
+ * Create a new serializer.
+ */
+ public XmlSchemaSerializer() {
docs = new ArrayList();
schema_ns = new Hashtable();
}
/**
- * *********************************************************************
- * Document[] serializeSchema(XmlSchema schemaObj,
- * boolean serializeIncluded)
- * <p/>
- * Serialize XmlSchema object pass back the document containing a schema
- * element as its root.
- * <p/>
- * Parameter:
- * schemaObj - Schema object to serialize.
- * serialzeIncluded - whether to serialize the included(imported)
- * schema or not. pass true for serialize all included
- * schema.
- * <p/>
- * Return:
- * Array of Documents that include/imported.
- * **********************************************************************
+ * Serialize an entire schema, returning an array of DOM Documents, one per XSL file.
+ * @param schemaObj The XML Schema.
+ * @param serializeIncluded whether to create DOM trees for any included or imported
+ * schemas.
+ * @return Documents. If serializeIncluded is false, the array with have one entry.
+ * The main document is always first.
+ * @throws XmlSchemaSerializerException
*/
public Document[] serializeSchema(XmlSchema schemaObj,
boolean serializeIncluded) throws XmlSchemaSerializerException {
@@ -2666,13 +2686,20 @@
}
}
+ /**
+ * Exception class used for serialization problems.
+ */
public static class XmlSchemaSerializerException extends Exception {
/**
*
*/
private static final long serialVersionUID = 1L;
-
+
+ /**
+ * Standard constructor with a message.
+ * @param msg the message.
+ */
public XmlSchemaSerializerException(String msg) {
super(msg);
}
@@ -2680,14 +2707,14 @@
/**
- * A generic method to process the extra attributes and the the extra
+ * A generic method to process the extra attributes and the extra
* elements present within the schema.
- * What are considered extensions are child elements with non schema namespace
- * and child attributes with any namespace
+ * What are considered extensions are child elements with non schema namespace
+ * and child attributes with any namespace.
* @param schemaObject
* @param parentElement
*/
- private void processExtensibilityComponents(XmlSchemaObject schemaObject,Element parentElement){
+ private void processExtensibilityComponents(XmlSchemaObject schemaObject, Element parentElement) {
if (extReg!=null){
Map metaInfoMap = schemaObject.getMetaInfoMap();
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/ws/commons/schema/utils/DOMUtil.java Fri Dec 5 17:09:01 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 {
Modified: webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/MANIFEST.MF?rev=723939&r1=723938&r2=723939&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/MANIFEST.MF (original)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/resources/META-INF/MANIFEST.MF Fri Dec 5 17:09:01 2008
@@ -15,7 +15,7 @@
org.apache.ws.commons.schema.utils,
org.apache.ws.commons.schema.constants,
org.apache.ws.commons.schema.extensions
-Bundle-Version: 1.4.2
+Bundle-Version: ${project.version}
Bundle-Name: XmlSchema
Bundle-DocURL: http://www.apache.org/
Bundle-ManifestVersion: 2