Author: jochen
Date: Sat Aug 12 18:25:53 2006
New Revision: 431129
URL: http://svn.apache.org/viewvc?rev=431129&view=rev
Log:
Moved the "src" and "test" directories to "src/main/java" and "src/test/java",
in order to match the Maven 2 standards.
Added:
webservices/commons/trunk/modules/XmlSchema/src/main/
webservices/commons/trunk/modules/XmlSchema/src/main/java/
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/
- copied from r430723,
webservices/commons/trunk/modules/XmlSchema/src/org/
webservices/commons/trunk/modules/XmlSchema/src/main/java/org/apache/
- copied from r431128,
webservices/commons/trunk/modules/XmlSchema/src/org/apache/
webservices/commons/trunk/modules/XmlSchema/src/test/
webservices/commons/trunk/modules/XmlSchema/src/test/java/
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/
- copied from r430723,
webservices/commons/trunk/modules/XmlSchema/test/tests/
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AllSimpleTypeTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/AllSimpleTypeTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnnotationTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/AnnotationTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyAttTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/AnyAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AnyTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/AnyTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/AttributeGroupTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/AttributeGroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/BlockTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/BlockTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ChoiceTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ChoiceTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/CircularSchemaTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/CircularSchemaTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ComplexContentRestrictionTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ComplexContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
- copied, changed from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ConstraintsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ExternalAttTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ExternalAttTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java
- copied, changed from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/FacetsTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/GroupTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/GroupTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ImportTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ImportTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/IncludeTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/IncludeTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ListTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ListTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/MixedContentTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/MixedContentTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java
- copied, changed from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/NotationTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/RedefineTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/RedefineTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentExtensionTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/SimpleContentExtensionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/SimpleContentRestrictionTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/SimpleContentRestrictionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementForm.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TestElementForm.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestElementRefs.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TestElementRefs.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestForwardRefs.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TestForwardRefs.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestLocalUnnamedSimpleType.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TestLocalUnnamedSimpleType.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestSimpleRestriction.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TestSimpleRestriction.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TestUnqualifiedSchema.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TestUnqualifiedSchema.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasRefTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TwoSchemasRefTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/TwoSchemasTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/TwoSchemasTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/UnionTest.java
- copied unchanged from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/UnionTest.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/
- copied from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/w3c/
Removed:
webservices/commons/trunk/modules/XmlSchema/src/org/
webservices/commons/trunk/modules/XmlSchema/test/
Modified:
webservices/commons/trunk/modules/XmlSchema/pom.xml
webservices/commons/trunk/modules/XmlSchema/project.xml
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
Modified: webservices/commons/trunk/modules/XmlSchema/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/pom.xml?rev=431129&r1=431128&r2=431129&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/pom.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/pom.xml Sat Aug 12 18:25:53 2006
@@ -26,6 +26,15 @@
</notifier>
</notifiers>
</ciManagement>
+ <mailingLists>
+ <mailingList>
+ <name>WS Commons Developers</name>
+ <subscribe>[EMAIL PROTECTED]</subscribe>
+ <unsubscribe>[EMAIL PROTECTED]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>http://mail-archives.apache.org/mod_mbox/ws-commons-dev/</archive>
+ </mailingList>
+ </mailingLists>
<inceptionYear>2004</inceptionYear>
<developers>
<developer>
@@ -149,6 +158,13 @@
<organization>Envoi Solutions</organization>
</developer>
</developers>
+ <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>
@@ -159,8 +175,6 @@
<url>http://www.apache.org/</url>
</organization>
<build>
- <sourceDirectory>src</sourceDirectory>
- <testSourceDirectory>test</testSourceDirectory>
<resources>
<resource>
<directory>src</directory>
@@ -246,9 +260,11 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3-SNAPSHOT</version>
<configuration>
<includes>
<include>**/*Test.java</include>
+ <include>tests/w3c/TestW3CSchemaBucket.java</include>
</includes>
<excludes>
<exclude>tests/w3c/SchemaTest.java</exclude>
Modified: webservices/commons/trunk/modules/XmlSchema/project.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/project.xml?rev=431129&r1=431128&r2=431129&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/project.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/project.xml Sat Aug 12 18:25:53
2006
@@ -194,8 +194,8 @@
<build>
<nagEmailAddress>[email protected]</nagEmailAddress>
- <sourceDirectory>src</sourceDirectory>
- <unitTestSourceDirectory>test</unitTestSourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>test/main/java</unitTestSourceDirectory>
<unitTest>
<includes>
Copied:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
(from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/ConstraintsTest.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java?p2=webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java&p1=webservices/commons/trunk/modules/XmlSchema/test/tests/ConstraintsTest.java&r1=431128&r2=431129&rev=431129&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/test/tests/ConstraintsTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/ConstraintsTest.java
Sat Aug 12 18:25:53 2006
@@ -133,8 +133,6 @@
assertEquals(new QName("http://soapinterop.org/types";,
"constraintTest"),
elem.getQName());
- System.out.println("*** " + elem.toString("xsd", 4) + " ***");
-
XmlSchemaObjectCollection c = elem.getConstraints();
assertEquals(3, c.getCount());
Copied:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java
(from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/FacetsTest.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java?p2=webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java&p1=webservices/commons/trunk/modules/XmlSchema/test/tests/FacetsTest.java&r1=431128&r2=431129&rev=431129&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/test/tests/FacetsTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/FacetsTest.java
Sat Aug 12 18:25:53 2006
@@ -86,8 +86,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "string"),
@@ -154,8 +152,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "integer"),
@@ -218,8 +214,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "decimal"),
@@ -283,8 +277,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "integer"),
@@ -352,8 +344,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "integer"),
@@ -420,8 +410,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";,
"normalizedString"),
@@ -485,8 +473,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "decimal"),
@@ -554,8 +540,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";,
"nonNegativeInteger"),
@@ -623,8 +607,6 @@
XmlSchemaSimpleType simpleType =
(XmlSchemaSimpleType)elem.getSchemaType();
- System.out.println("*** " + simpleType.toString("xsd", 4) + " ***");
-
XmlSchemaSimpleTypeRestriction r =
(XmlSchemaSimpleTypeRestriction)simpleType.getContent();
assertEquals(new QName("http://www.w3.org/2001/XMLSchema";, "string"),
Copied:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java
(from r431128,
webservices/commons/trunk/modules/XmlSchema/test/tests/NotationTest.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java?p2=webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java&p1=webservices/commons/trunk/modules/XmlSchema/test/tests/NotationTest.java&r1=431128&r2=431129&rev=431129&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/test/tests/NotationTest.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/NotationTest.java
Sat Aug 12 18:25:53 2006
@@ -120,7 +120,6 @@
XmlSchemaEnumerationFacet xsef =
(XmlSchemaEnumerationFacet)xsoc.getItem(i);
String value = (String)xsef.getValue();
- System.out.println("*** value = " + value + " ***");
if (!(value.equals("tns:teamLogo")
|| value.equals("tns:teamMascot"))) {
fail("An unexpected value of \"" + value
@@ -131,8 +130,6 @@
assertTrue("The set should have been empty, but instead contained: "
+ s + ".",
s.isEmpty());
-
- System.out.println("*** " + elem.toString("xsd", 4) + " ***");
XmlSchemaObjectTable xsot = schema.getNotations();
assertEquals(2, xsot.getCount());
Modified:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java?rev=431129&r1=431128&r2=431129&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaBucket.java
Sat Aug 12 18:25:53 2006
@@ -38,7 +38,7 @@
private static List allTestSetFiles;
// If tests run from cmd line without any args, run the full suite
- private static String testSetsLocation = "./build/xmlschema2002-01-16";
+ private static String testSetsLocation = "./target/xmlschema2002-01-16";
public TestW3CSchemaBucket(String name) {
super(name);
Modified:
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java?rev=431129&r1=431128&r2=431129&view=diff
==============================================================================
---
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
(original)
+++
webservices/commons/trunk/modules/XmlSchema/src/test/java/tests/w3c/TestW3CSchemaTestSet.java
Sat Aug 12 18:25:53 2006
@@ -53,7 +53,7 @@
private File testSetFile = null;
// If junit called from cmd line without any args, use the NIST test bucket
- private static String testSetLocation =
"./build/xmlschema2002-01-16/NISTXMLSchema1-0-20020116.testSet";
+ private static String testSetLocation =
"./target/xmlschema2002-01-16/NISTXMLSchema1-0-20020116.testSet";
private TestW3CSchemaTestSet(String name, File testSetFile) {
super(name);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
