You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2008/04/19 10:07:25 UTC

svn commit: r649768 - in /incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution: processor/impl/DexContributionProcessor.java service/impl/ContributionServiceImpl.java

Author: adrianocrestani
Date: Sat Apr 19 01:07:22 2008
New Revision: 649768

URL: http://svn.apache.org/viewvc?rev=649768&view=rev
Log:
-updating Android test files on the sandbox

Added:
    incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java
Modified:
    incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java

Added: incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java?rev=649768&view=auto
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java (added)
+++ incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/DexContributionProcessor.java Sat Apr 19 01:07:22 2008
@@ -0,0 +1,114 @@
+package org.apache.tuscany.sca.contribution.processor.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.tuscany.sca.android.DexResource;
+import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
+import org.apache.tuscany.sca.contribution.service.ContributionException;
+
+public class DexContributionProcessor implements PackageProcessor {
+
+	public URL getArtifactURL(URL packageSourceURL, URI artifact)
+			throws MalformedURLException {
+		return new URL(artifact.toString());
+	}
+
+	public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream)
+			throws ContributionException, IOException {
+		
+		ArrayList<URI> uris = new ArrayList<URI>();
+		DexResource res = new DexResource(packageSourceURL);
+		
+		URI[] contentFiles = res.getContentFiles();
+		
+		for (URI uri : contentFiles) {
+			String fileName = DexResource.getFile(uri.getPath());
+			URL url = uri.toURL();
+			
+			if (fileName != null) {
+				
+				if (fileName.endsWith("_composite")) {
+					
+					url.openConnection();
+					try {
+						XMLStreamReader r = XMLInputFactory.newInstance().createXMLStreamReader(url.openStream());
+						
+						while (r.hasNext()) {
+							
+							if (r.isStartElement()) {
+								QName name = r.getName();
+								
+								if ("implementation.java".equals(name.getLocalPart())) {
+									int attributeCount = r.getAttributeCount();
+									
+									for (int i = 0 ; i < attributeCount ; i++) {
+										
+										if (r.getAttributeLocalName(i).equals("class")) {
+											StringBuffer sb = new StringBuffer("dex://");
+											sb.append(r.getAttributeValue(i).replace('.', '/')).append(".class");
+											
+											try {
+												uris.add(new URI(sb.toString()));
+											} catch (URISyntaxException e) {}
+											
+											break;
+											
+										}
+										
+									}
+									
+								}
+							
+							}
+							
+							r.next();
+							
+						}
+						
+						
+						
+					} catch (XMLStreamException e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					} catch (FactoryConfigurationError e1) {
+						// TODO Auto-generated catch block
+						e1.printStackTrace();
+					}
+					
+					StringBuffer sb = new StringBuffer(url.getFile());
+					sb.delete(sb.length() - 10, sb.length()).append(".composite");
+					
+					try {
+						uris.add(new URI(uri.toString()));
+					} catch (URISyntaxException e) {
+						continue;
+					}
+					
+				}
+				
+			}
+			
+		}
+		
+		return uris;
+		
+	}
+
+	public String getPackageType() {
+		return "application/x-dex";
+	}
+
+}

Modified: incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?rev=649768&r1=649767&r2=649768&view=diff
==============================================================================
--- incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java (original)
+++ incubator/tuscany/sandbox/mobile-android/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java Sat Apr 19 01:07:22 2008
@@ -383,7 +383,9 @@
         }
 
         // store the contribution on the registry
-        this.contributionRepository.addContribution(contribution);
+        if (this.contributionRepository != null) {
+        	this.contributionRepository.addContribution(contribution);
+        }
 
         return contribution;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org