You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/09/12 00:43:06 UTC
svn commit: r574714 - in /incubator/tuscany/java/sca/modules:
contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/
contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/
contribution-impl/src/ma...
Author: lresende
Date: Tue Sep 11 15:43:05 2007
New Revision: 574714
URL: http://svn.apache.org/viewvc?rev=574714&view=rev
Log:
Contribution module review and clean-up
Removed:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/util/ConcurrentHashList.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolver.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionMetadataDocumentProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/InvalidConfigurationException.java
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionException.java Tue Sep 11 15:43:05 2007
@@ -26,9 +26,6 @@
*/
public class InvalidFolderContributionException extends ContributionException {
- /**
- *
- */
private static final long serialVersionUID = 1564255850052593282L;
protected InvalidFolderContributionException(String componentDefinitionLocatoin) {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/InvalidFolderContributionURIException.java Tue Sep 11 15:43:05 2007
@@ -26,9 +26,6 @@
*/
public class InvalidFolderContributionURIException extends ContributionException {
- /**
- *
- */
private static final long serialVersionUID = 1564255850052593282L;
protected InvalidFolderContributionURIException(String componentDefinitionLocatoin) {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataDocumentProcessor.java Tue Sep 11 15:43:05 2007
@@ -37,7 +37,7 @@
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
/**
- * Loader that handles contribution metadata files
+ * MetadataDocumentProcessor that handles contribution metadata files
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionMetadataProcessor.java Tue Sep 11 15:43:05 2007
@@ -40,14 +40,13 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
/**
- * Loader that handles contribution metadata files
+ * Processor responsible for loading particular elements from contribution metadata file
*
* @version $Rev$ $Date$
*/
public class ContributionMetadataProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Contribution> {
private static final String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
- private static final String TARGET_NAMESPACE = "targetNamespace";
private static final QName CONTRIBUTION = new QName(SCA10_NS, "contribution");
private static final QName DEPLOYABLE = new QName(SCA10_NS, "deployable");
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionMetadataException.java Tue Sep 11 15:43:05 2007
@@ -27,9 +27,6 @@
*/
public class InvalidContributionMetadataException extends ContributionException {
- /**
- *
- */
private static final long serialVersionUID = -3184477070625689942L;
protected InvalidContributionMetadataException() {
Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/InvalidContributionURIException.java Tue Sep 11 15:43:05 2007
@@ -27,9 +27,6 @@
*/
public class InvalidContributionURIException extends ContributionException {
- /**
- *
- */
private static final long serialVersionUID = -3184477070625689942L;
protected InvalidContributionURIException() {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/BaseStAXArtifactProcessor.java Tue Sep 11 15:43:05 2007
@@ -179,6 +179,12 @@
}
}
+ /**
+ *
+ * @param writer
+ * @param uri
+ * @throws XMLStreamException
+ */
private void writeElementPrefix(XMLStreamWriter writer, String uri) throws XMLStreamException {
if (uri == null) {
return;
@@ -384,6 +390,11 @@
}
}
+ /**
+ * Write to document
+ * @param writer
+ * @throws XMLStreamException
+ */
public void write(XMLStreamWriter writer) throws XMLStreamException {
String str;
if (value instanceof QName) {
@@ -444,6 +455,11 @@
}
}
+ /**
+ * Registers a prefix for the namespace of a QName or list of QNames
+ * @param writer
+ * @throws XMLStreamException
+ */
public void writePrefix(XMLStreamWriter writer) throws XMLStreamException {
if (value instanceof QName) {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensiblePackageProcessor.java Tue Sep 11 15:43:05 2007
@@ -33,6 +33,9 @@
/**
* Default implementation of PackageProcessor.
*
+ * This implementation has a packageProcessorExtensionPoint
+ * and it delegates to the proper package processor based on content type
+ *
* @version $Rev$ $Date$
*/
public class ExtensiblePackageProcessor implements PackageProcessor {
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleStAXArtifactProcessor.java Tue Sep 11 15:43:05 2007
@@ -39,6 +39,9 @@
/**
* The default implementation of a StAX artifact processor registry.
*
+ * This implementation has a StAXArtifactProcessorExtensionPoint and
+ * it delegates to the proper StAXArtifactProcessor by element QName
+ *
* @version $Rev$ $Date$
*/
public class ExtensibleStAXArtifactProcessor
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ExtensibleURLArtifactProcessor.java Tue Sep 11 15:43:05 2007
@@ -29,6 +29,9 @@
/**
* The default implementation of a URL artifact processor.
*
+ * This implementation has a URLArtifactProcessorExtensionPoint and
+ * it delegate to the proper URLArtifactProcessor by either fileName or fileExtention
+ *
* @version $Rev$ $Date$
*/
public class ExtensibleURLArtifactProcessor
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/StAXArtifactProcessorExtensionPoint.java Tue Sep 11 15:43:05 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.contribution.processor;
/**
- * A registry for DOM artifact processors.
+ * A registry for StAX artifact processors.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/URLArtifactProcessorExtensionPoint.java Tue Sep 11 15:43:05 2007
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.contribution.processor;
/**
- * A registry for Stream artifact processors.
+ * A registry for Document artifact processors.
*
* @version $Rev$ $Date$
*/
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ExtensibleModelResolver.java Tue Sep 11 15:43:05 2007
@@ -29,7 +29,7 @@
/**
* An implementation of an extensible model resolver which delegates to the
* proper resolver extension based on the class of the model to resolve.
- *
+ *
* @version $Rev$ $Date$
*/
public class ExtensibleModelResolver implements ModelResolver {
@@ -42,6 +42,7 @@
/**
* Constructs an extensible model resolver
+ *
* @param resolvers
* @param contribution
*/
@@ -56,6 +57,7 @@
/**
* Returns the proper resolver instance based on the interfaces of the model
* If one is not available on the registry, instantiate on demand
+ *
* @param modelType
* @return
*/
@@ -71,7 +73,7 @@
}
for (Class<?> c : classes) {
- // Look up an existing model resolver instance
+ // Look up an existing model resolver instance
ModelResolver resolverInstance = resolverInstances.get(c);
if (resolverInstance != null) {
return resolverInstance;
Modified: incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java?rev=574714&r1=574713&r2=574714&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java (original)
+++ incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java Tue Sep 11 15:43:05 2007
@@ -24,9 +24,7 @@
* @version $Rev$ $Date$
*/
public class ContributionException extends AbstractContributionException {
- /**
- *
- */
+
private static final long serialVersionUID = 4432880414927652578L;
protected ContributionException() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org