You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/01/29 08:49:21 UTC
svn commit: r616194 - in
/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution:
processor/impl/ resolver/impl/ service/util/
Author: jsdelfino
Date: Mon Jan 28 23:49:21 2008
New Revision: 616194
URL: http://svn.apache.org/viewvc?rev=616194&view=rev
Log:
Simplified the package processors a little. Added comments and FIXME tags.
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java?rev=616194&r1=616193&r2=616194&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java Mon Jan 28 23:49:21 2008
@@ -33,24 +33,19 @@
import org.apache.tuscany.sca.contribution.processor.PackageProcessor;
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
/**
- * Folder contribution package processor
+ * Folder contribution package processor.
*
* @version $Rev$ $Date$
*/
public class FolderContributionProcessor implements PackageProcessor {
- /**
- * Package-type that this package processor can handle
- */
- public static final String PACKAGE_TYPE = PackageType.FOLDER;
public FolderContributionProcessor() {
}
public String getPackageType() {
- return PACKAGE_TYPE;
+ return PackageType.FOLDER;
}
/**
@@ -58,27 +53,24 @@
*
* @param fileList
* @param file
+ * @param root
* @throws IOException
*/
- private void traverse(List<URI> fileList, File file, File root) throws IOException {
+ private static void traverse(List<URI> fileList, File file, File root) throws IOException {
if (file.isFile()) {
fileList.add(root.toURI().relativize(file.toURI()));
-
} else if (file.isDirectory()) {
- // FIXME: Maybe we should externalize it as a property
- // Regular expression to exclude .xxx files
-
String uri = root.toURI().relativize(file.toURI()).toString();
if (uri.endsWith("/")) {
uri = uri.substring(0, uri.length() - 1);
}
fileList.add(URI.create(uri));
- //FIXME Do we really need to use a regexp here to filter out
- // file names that start one or two dots?
- File[] files = file.listFiles(FileHelper.getFileFilter("[^\u002e].*", true));
- for (int i = 0; i < files.length; i++) {
- traverse(fileList, files[i], root);
+ File[] files = file.listFiles();
+ for (File f: files) {
+ if (!f.getName().startsWith(".")) {
+ traverse(fileList, f, root);
+ }
}
}
}
@@ -87,12 +79,6 @@
return new URL(sourceURL, artifact.toString());
}
- /**
- * Get a list of artifact URI from the folder
- *
- * @return The list of artifact URI for the folder
- * @throws IOException
- */
public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException,
IOException {
if (packageSourceURL == null) {
@@ -111,7 +97,7 @@
throw new ContributionReadException(rootFolder.getAbsolutePath());
}
- this.traverse(artifacts, rootFolder, rootFolder);
+ traverse(artifacts, rootFolder, rootFolder);
}
} catch (URISyntaxException e) {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java?rev=616194&r1=616193&r2=616194&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java Mon Jan 28 23:49:21 2008
@@ -36,21 +36,17 @@
import org.apache.tuscany.sca.contribution.service.ContributionException;
/**
- * Jar Contribution package processor
+ * Jar Contribution package processor.
*
* @version $Rev$ $Date$
*/
public class JarContributionProcessor implements PackageProcessor {
- /**
- * Package-type that this package processor can handle
- */
- public static final String PACKAGE_TYPE = PackageType.JAR;
public JarContributionProcessor() {
}
public String getPackageType() {
- return PACKAGE_TYPE;
+ return PackageType.JAR;
}
public URL getArtifactURL(URL sourceURL, URI artifact) throws MalformedURLException {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java?rev=616194&r1=616193&r2=616194&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/resolver/impl/ModelResolverImpl.java Mon Jan 28 23:49:21 2008
@@ -37,8 +37,10 @@
private Map<Object, Object> map = new HashMap<Object, Object>();
+ //FIXME Remove dependencies on classloaders
private WeakReference<ClassLoader> classLoader;
+ //FIXME Remove dependencies on classloaders
public ModelResolverImpl(ClassLoader classLoader) {
this.classLoader = new WeakReference<ClassLoader>(classLoader);
}
@@ -52,9 +54,12 @@
} else if (unresolved instanceof ClassReference) {
+ //FIXME Remove dependencies on classloaders, resolution of classes
+ // should move to the java import support module.
+
// Load a class on demand
ClassReference classReference = (ClassReference)unresolved;
- Class clazz;
+ Class<?> clazz;
try {
clazz = Class.forName(classReference.getClassName(), true, classLoader.get());
} catch (ClassNotFoundException e) {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java?rev=616194&r1=616193&r2=616194&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/FileHelper.java Mon Jan 28 23:49:21 2008
@@ -44,9 +44,6 @@
*/
private static final char WINDOWS_SEPARATOR = '\\';
- protected FileHelper() {
- }
-
/**
* Returns the index of the last directory separator character.
* <p>
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java?rev=616194&r1=616193&r2=616194&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/IOHelper.java Mon Jan 28 23:49:21 2008
@@ -32,10 +32,6 @@
*/
private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
- protected IOHelper() {
-
- }
-
/**
* Unconditionally close an <code>InputStream</code>.
* <p>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org