Change Java package from edu.uci.ics to org.apache
Change-Id: I2f01d2b5614e9e9c94fda4bf1294a8eba6a26c54
Reviewed-on: https://asterix-gerrit.ics.uci.edu/309
Reviewed-by: Till Westmann <tillw@apache.org>
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
diff --git a/asterix-test-framework/pom.xml b/asterix-test-framework/pom.xml
index 54e2f60..98e7be9 100644
--- a/asterix-test-framework/pom.xml
+++ b/asterix-test-framework/pom.xml
@@ -16,7 +16,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asterix</artifactId>
- <groupId>edu.uci.ics.asterix</groupId>
+ <groupId>org.apache.asterix</groupId>
<version>0.8.7-SNAPSHOT</version>
</parent>
<artifactId>asterix-test-framework</artifactId>
diff --git a/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java b/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
index 3167a17..553f421 100644
--- a/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
+++ b/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestCaseContext.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package edu.uci.ics.asterix.testframework.context;
+package org.apache.asterix.testframework.context;
import java.io.File;
import java.util.ArrayList;
@@ -20,12 +20,12 @@
import java.util.List;
import java.util.regex.Pattern;
-import edu.uci.ics.asterix.testframework.xml.CategoryEnum;
-import edu.uci.ics.asterix.testframework.xml.TestCase;
-import edu.uci.ics.asterix.testframework.xml.TestCase.CompilationUnit;
-import edu.uci.ics.asterix.testframework.xml.TestGroup;
-import edu.uci.ics.asterix.testframework.xml.TestSuite;
-import edu.uci.ics.asterix.testframework.xml.TestSuiteParser;
+import org.apache.asterix.testframework.xml.CategoryEnum;
+import org.apache.asterix.testframework.xml.TestCase;
+import org.apache.asterix.testframework.xml.TestCase.CompilationUnit;
+import org.apache.asterix.testframework.xml.TestGroup;
+import org.apache.asterix.testframework.xml.TestSuite;
+import org.apache.asterix.testframework.xml.TestSuiteParser;
public class TestCaseContext {
diff --git a/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestFileContext.java b/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestFileContext.java
index f3bdddd..7d0af64 100644
--- a/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestFileContext.java
+++ b/asterix-test-framework/src/main/java/org/apache/asterix/testframework/context/TestFileContext.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package edu.uci.ics.asterix.testframework.context;
+package org.apache.asterix.testframework.context;
import java.io.File;
diff --git a/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java b/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
index e72b103..217e547 100644
--- a/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
+++ b/asterix-test-framework/src/main/java/org/apache/asterix/testframework/xml/TestSuiteParser.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package edu.uci.ics.asterix.testframework.xml;
+package org.apache.asterix.testframework.xml;
import java.io.File;
@@ -22,8 +22,8 @@
public TestSuiteParser() {
}
- public edu.uci.ics.asterix.testframework.xml.TestSuite parse(File testSuiteCatalog) throws Exception {
- JAXBContext ctx = JAXBContext.newInstance(edu.uci.ics.asterix.testframework.xml.TestSuite.class);
- return (edu.uci.ics.asterix.testframework.xml.TestSuite) ctx.createUnmarshaller().unmarshal(testSuiteCatalog);
+ public org.apache.asterix.testframework.xml.TestSuite parse(File testSuiteCatalog) throws Exception {
+ JAXBContext ctx = JAXBContext.newInstance(org.apache.asterix.testframework.xml.TestSuite.class);
+ return (org.apache.asterix.testframework.xml.TestSuite) ctx.createUnmarshaller().unmarshal(testSuiteCatalog);
}
}
\ No newline at end of file
diff --git a/asterix-test-framework/src/main/resources/Catalog.xsd b/asterix-test-framework/src/main/resources/Catalog.xsd
index 65ba7a4..771c216 100644
--- a/asterix-test-framework/src/main/resources/Catalog.xsd
+++ b/asterix-test-framework/src/main/resources/Catalog.xsd
@@ -1,6 +1,6 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:test="urn:xml.testframework.asterix.ics.uci.edu"
- targetNamespace="urn:xml.testframework.asterix.ics.uci.edu" elementFormDefault="qualified">
+ xmlns:test="urn:xml.testframework.asterix.apache.org"
+ targetNamespace="urn:xml.testframework.asterix.apache.org" elementFormDefault="qualified">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- test-suite - top level element -->