Author: jsdelfino
Date: Mon Jan 28 19:10:32 2008
New Revision: 616149
URL: http://svn.apache.org/viewvc?rev=616149&view=rev
Log:
Minor cleanup of the contribution service and resolver interfaces. Removed
unused exceptions and unused constructors on these exceptions. Added a few
FIXME comments for things that need to be fixed later.
Added:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
- copied, changed from r616070,
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
Removed:
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/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/service/AbstractContributionException.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionWireException.java
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
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/service/impl/ContributionServiceImpl.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/resolver/ClassReference.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/ContributionException.java
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
Modified:
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProcessor.java
Mon Jan 28 19:10:32 2008
@@ -32,7 +32,6 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWireException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -95,6 +94,4 @@
public void resolve(NotificationBinding notificationBinding, ModelResolver
resolver) throws ContributionResolveException {
}
- public void wire(NotificationBinding notificationBinding) throws
ContributionWireException {
- }
}
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=616149&r1=616148&r2=616149&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 19:10:32 2008
@@ -114,7 +114,7 @@
}
} catch (URISyntaxException e) {
- throw new
InvalidFolderContributionURIException(packageSourceURL.toExternalForm(), e);
+ throw new
InvalidFolderContributionException(packageSourceURL.toExternalForm(), e);
}
return artifacts;
Modified:
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/service/impl/ContributionServiceImpl.java
Mon Jan 28 19:10:32 2008
@@ -43,6 +43,7 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import
org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.service.ContributionException;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import org.apache.tuscany.sca.contribution.service.ContributionRepository;
import org.apache.tuscany.sca.contribution.service.ContributionService;
import
org.apache.tuscany.sca.contribution.service.ExtensibleContributionListener;
@@ -232,7 +233,7 @@
try {
metadataDocumentProcessor.read(contributionMetadata);
} catch (XMLStreamException e) {
- throw new InvalidContributionMetadataException("Invalid
contribution metadata for contribution.");
+ throw new ContributionReadException("Invalid contribution metadata
for contribution.");
}
// For debugging purposes, write it back to XML
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=616149&r1=616148&r2=616149&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
Mon Jan 28 19:10:32 2008
@@ -28,7 +28,7 @@
import org.apache.tuscany.sca.contribution.service.ContributionException;
import org.apache.tuscany.sca.contribution.service.TypeDescriber;
-import
org.apache.tuscany.sca.contribution.service.UnsupportedContentTypeException;
+import
org.apache.tuscany.sca.contribution.service.UnsupportedPackageTypeException;
/**
* Implementation of an extensible package processor.
@@ -50,14 +50,14 @@
public List<URI> getArtifacts(URL packageSourceURL, InputStream
inputStream)
throws ContributionException, IOException {
- String contentType =
this.packageTypeDescriber.getType(packageSourceURL, null);
- if (contentType == null) {
- throw new UnsupportedContentTypeException("Unsupported
contribution package", packageSourceURL.toString());
+ String packageType =
this.packageTypeDescriber.getType(packageSourceURL, null);
+ if (packageType == null) {
+ throw new UnsupportedPackageTypeException("Unsupported
contribution package type: " + packageSourceURL.toString());
}
- PackageProcessor packageProcessor =
this.processors.getPackageProcessor(contentType);
+ PackageProcessor packageProcessor =
this.processors.getPackageProcessor(packageType);
if (packageProcessor == null) {
- throw new UnsupportedContentTypeException(contentType,
packageSourceURL.getPath());
+ throw new UnsupportedPackageTypeException("Unsupported
contribution package type: " + packageType);
}
return packageProcessor.getArtifacts(packageSourceURL, inputStream);
Modified:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/ClassReference.java
Mon Jan 28 19:10:32 2008
@@ -24,6 +24,9 @@
/**
* A weak reference to a class, which should be used to register classes
* with an ArtifactResolver and resolve these classes later.
+ *
+ * FIXME The core contribution model should not have dependencies on classes
+ * and classloaders. This should move to the Java import support module.
*
* @version $Rev$ $Date$
*/
Modified:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultImportAllModelResolver.java
Mon Jan 28 19:10:32 2008
@@ -58,18 +58,14 @@
// Go over all exports in the contribution
for (Export export : contribution.getExports()) {
- // If the export matches our namespace, try to the resolve
the model object
+
+ // If the export matches the export, try to resolve the
model object
if (import_.match(export)) {
Object resolved =
export.getModelResolver().resolveModel(modelClass, unresolved);
// Return the resolved model object
if (resolved instanceof Base) {
if (!((Base)resolved).isUnresolved()) {
- return modelClass.cast(resolved);
- }
- }
- else if (resolved instanceof
org.apache.tuscany.sca.assembly.Base) {
- if
(!((org.apache.tuscany.sca.assembly.Base)resolved).isUnresolved()) {
return modelClass.cast(resolved);
}
}
Modified:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/resolver/DefaultModelResolverExtensionPoint.java
Mon Jan 28 19:10:32 2008
@@ -28,7 +28,7 @@
/**
- * The default implementation of a model resolver Class registry.
+ * The default implementation of a model resolver extension point.
*
* @version $Rev$ $Date$
*/
@@ -38,7 +38,7 @@
private Map<String, ServiceDeclaration> loadedResolvers;
/**
- * Constructs a new model resolver registry.
+ * Constructs a new DefaultModelResolverExtensionPoint.
*/
public DefaultModelResolverExtensionPoint() {
}
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=616149&r1=616148&r2=616149&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
Mon Jan 28 19:10:32 2008
@@ -23,7 +23,7 @@
*
* @version $Rev$ $Date$
*/
-public class ContributionException extends AbstractContributionException {
+public class ContributionException extends Exception {
private static final long serialVersionUID = 4432880414927652578L;
@@ -35,16 +35,8 @@
super(message);
}
- protected ContributionException(String message, String identifier) {
- super(message, identifier);
- }
-
protected ContributionException(String message, Throwable cause) {
super(message, cause);
- }
-
- protected ContributionException(String message, String identifier,
Throwable cause) {
- super(message, identifier, cause);
}
public ContributionException(Throwable cause) {
Modified:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
Mon Jan 28 19:10:32 2008
@@ -21,29 +21,22 @@
/**
* Exception thrown to indicate that a Content-Type is not supported by this
SCA Domain.
* The Content-Type value supplied will be returned as the message text for
this exception.
+ *
+ * FIXME Don't use as it's deprecated and replaced by
UnsupportedPackageTypeException.
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class UnsupportedContentTypeException extends ContributionException {
private static final long serialVersionUID = -1831797280021355672L;
/**
- * Constructor specifying the Content-Type value that is not supported.
+ * Constructs a new UnsupportedContentTypeException.
*
- * @param contentType the type that is not supported
+ * @param message
*/
- public UnsupportedContentTypeException(String contentType) {
- super(contentType);
+ public UnsupportedContentTypeException(String message) {
+ super(message);
}
- /**
- * Constructor specifying the Content-Type value that is not supported
- * and an identifier to use with this exception (typically the resource
being processed).
- *
- * @param contentType the type that is not supported
- * @param identifier an identifier for this exception
- */
- public UnsupportedContentTypeException(String contentType, String
identifier) {
- super(contentType, identifier);
- }
}
Copied:
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
(from r616070,
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java?p2=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java&p1=incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java&r1=616070&r2=616149&rev=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedContentTypeException.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/service/UnsupportedPackageTypeException.java
Mon Jan 28 19:10:32 2008
@@ -24,26 +24,16 @@
*
* @version $Rev$ $Date$
*/
-public class UnsupportedContentTypeException extends ContributionException {
+public class UnsupportedPackageTypeException extends ContributionException {
private static final long serialVersionUID = -1831797280021355672L;
/**
- * Constructor specifying the Content-Type value that is not supported.
+ * Constructs a new UnsupportedPackageTypeException.
*
- * @param contentType the type that is not supported
+ * @param message
*/
- public UnsupportedContentTypeException(String contentType) {
- super(contentType);
+ public UnsupportedPackageTypeException(String message) {
+ super(message);
}
- /**
- * Constructor specifying the Content-Type value that is not supported
- * and an identifier to use with this exception (typically the resource
being processed).
- *
- * @param contentType the type that is not supported
- * @param identifier an identifier for this exception
- */
- public UnsupportedContentTypeException(String contentType, String
identifier) {
- super(contentType, identifier);
- }
}
Modified:
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-notification/src/main/java/org/apache/tuscany/sca/implementation/notification/NotificationImplementationProcessor.java
Mon Jan 28 19:10:32 2008
@@ -32,7 +32,6 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWireException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
/**
@@ -90,9 +89,6 @@
}
impl.setComponentType(componentType);
impl.setUnresolved(false);
- }
-
- public void wire(NotificationImplementationImpl model) throws
ContributionWireException {
}
public void write(NotificationImplementationImpl model, XMLStreamWriter
outputSource)
Modified:
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java?rev=616149&r1=616148&r2=616149&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementationProcessor.java
Mon Jan 28 19:10:32 2008
@@ -35,7 +35,6 @@
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWireException;
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import
org.apache.tuscany.sca.implementation.spring.xml.SpringXMLComponentTypeLoader;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
@@ -173,10 +172,6 @@
} // end if
} // end method resolve
-
- public void wire(SpringImplementation model) throws
ContributionWireException {
- // TODO Auto-generated method stub
- }
public QName getArtifactType() {
return IMPLEMENTATION_SPRING_QNAME;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
