diff options
| author | Raphael <raphael@google.com> | 2009-05-14 19:48:53 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2009-05-14 19:48:53 -0700 |
| commit | 8d9e4d6d7c53904f0769005014f3fea88c95b114 (patch) | |
| tree | 49fda41d26474e1d9d12b606d95c276e855fabff | |
| parent | 9f689d4e969932d498fec30d386e2b818f0d02ae (diff) | |
| download | sdk-8d9e4d6d7c53904f0769005014f3fea88c95b114.zip sdk-8d9e4d6d7c53904f0769005014f3fea88c95b114.tar.gz sdk-8d9e4d6d7c53904f0769005014f3fea88c95b114.tar.bz2 | |
ADT #1844909: Move sdk-repository XSD and tests from SdkManager to SdkLib.
| -rw-r--r-- | sdkmanager/libs/sdklib/.classpath | 16 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepositoryConstants.java (renamed from sdkmanager/app/src/com/android/sdkmanager/repository/SdkRepositoryConstants.java) | 2 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository.xsd (renamed from sdkmanager/app/src/com/android/sdkmanager/repository/sdk-repository.xsd) | 0 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java (renamed from sdkmanager/app/tests/com/android/sdkmanager/repository/TestXml.java) | 8 | ||||
| -rwxr-xr-x | sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml (renamed from sdkmanager/app/tests/com/android/sdkmanager/repository/repository_sample.xml) | 0 |
5 files changed, 15 insertions, 11 deletions
diff --git a/sdkmanager/libs/sdklib/.classpath b/sdkmanager/libs/sdklib/.classpath index fc17a43..050eeb2 100644 --- a/sdkmanager/libs/sdklib/.classpath +++ b/sdkmanager/libs/sdklib/.classpath @@ -1,7 +1,9 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/AndroidPrefs"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/sdkmanager/app/src/com/android/sdkmanager/repository/SdkRepositoryConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepositoryConstants.java index f911989..d10808f 100755 --- a/sdkmanager/app/src/com/android/sdkmanager/repository/SdkRepositoryConstants.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/SdkRepositoryConstants.java @@ -14,7 +14,7 @@ * limitations under the License.
*/
-package com.android.sdkmanager.repository;
+package com.android.sdklib.repository;
import java.io.InputStream;
diff --git a/sdkmanager/app/src/com/android/sdkmanager/repository/sdk-repository.xsd b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository.xsd index c59197f..c59197f 100755 --- a/sdkmanager/app/src/com/android/sdkmanager/repository/sdk-repository.xsd +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/repository/sdk-repository.xsd diff --git a/sdkmanager/app/tests/com/android/sdkmanager/repository/TestXml.java b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java index 482ef26..68b475a 100755 --- a/sdkmanager/app/tests/com/android/sdkmanager/repository/TestXml.java +++ b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/TestSdkRepository.java @@ -14,7 +14,9 @@ * limitations under the License.
*/
-package com.android.sdkmanager.repository;
+package com.android.sdklib.repository;
+
+import com.android.sdklib.repository.SdkRepositoryConstants;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
@@ -36,7 +38,7 @@ import junit.framework.TestCase; * References:
* http://www.ibm.com/developerworks/xml/library/x-javaxmlvalidapi.html
*/
-public class TestXml extends TestCase {
+public class TestSdkRepository extends TestCase {
@Override
protected void setUp() throws Exception {
@@ -51,7 +53,7 @@ public class TestXml extends TestCase { public void testValidateLocalRepositoryFile() throws Exception {
InputStream xsdStream = SdkRepositoryConstants.getXsdStream();
- InputStream xmlStream = TestXml.class.getResourceAsStream("repository_sample.xml");
+ InputStream xmlStream = TestSdkRepository.class.getResourceAsStream("repository_sample.xml");
SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
diff --git a/sdkmanager/app/tests/com/android/sdkmanager/repository/repository_sample.xml b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml index 0643185..0643185 100755 --- a/sdkmanager/app/tests/com/android/sdkmanager/repository/repository_sample.xml +++ b/sdkmanager/libs/sdklib/tests/com/android/sdklib/repository/repository_sample.xml |