You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2007/02/22 07:42:03 UTC
svn commit: r510419 - in /incubator/tuscany/java/sca/kernel:
api/src/main/java/org/apache/tuscany/api/annotation/
core/src/main/java/org/apache/tuscany/core/builder/
core/src/main/java/org/apache/tuscany/core/component/
core/src/main/java/org/apache/tu...
Author: jmarino
Date: Wed Feb 21 22:42:01 2007
New Revision: 510419
URL: http://svn.apache.org/viewvc?view=rev&rev=510419
Log:
sourcecheck and pmd violations
Modified:
incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContributionServiceImplTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessorTestCase.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java
Modified: incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java (original)
+++ incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java Wed Feb 21 22:42:01 2007
@@ -35,15 +35,15 @@
/**
* Denotes the name of the resource declared by the implementation.
*/
- public String name() default "";
+ String name() default "";
/**
* Denotes if the resource is optional
*/
- public boolean optional() default false;
+ boolean optional() default false;
/**
* Denotes the default name of the resource provided by the runtime environment.
*/
- public String mappedName() default "";
+ String mappedName() default "";
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/BuilderRegistryImpl.java Wed Feb 21 22:42:01 2007
@@ -62,7 +62,7 @@
private ScopeRegistry scopeRegistry;
private final Map<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>
- componentBuilders =
+ componentBuilders =
new HashMap<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>();
private final Map<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>> bindingBuilders =
new HashMap<Class<? extends BindingDefinition>, BindingBuilder<? extends BindingDefinition>>();
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/JavaPhysicalComponentDefinition.java Wed Feb 21 22:42:01 2007
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.core.component;
-import java.net.URI;
-
import org.apache.tuscany.spi.model.physical.PhysicalComponentDefinition;
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/PassByValueWirePostProcessor.java Wed Feb 21 22:42:01 2007
@@ -32,7 +32,7 @@
* @version $Rev$ $Date$
*/
public class PassByValueWirePostProcessor extends WirePostProcessorExtension {
- private DataBindingRegistry dataBindingRegistry;
+ //private DataBindingRegistry dataBindingRegistry;
public PassByValueWirePostProcessor() {
super();
@@ -44,7 +44,7 @@
*/
@Autowire
public void setDataBindingRegistry(DataBindingRegistry dataBindingRegistry) {
- this.dataBindingRegistry = dataBindingRegistry;
+ // this.dataBindingRegistry = dataBindingRegistry;
}
public void process(Wire wire) {
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/deployer/AbstractDeploymentContext.java Wed Feb 21 22:42:01 2007
@@ -18,15 +18,13 @@
*/
package org.apache.tuscany.core.deployer;
-import java.net.URL;
import java.net.URI;
-import java.util.ArrayList;
+import java.net.URL;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.deployer.DeploymentContext;
/**
* Base class for DeploymentContext implementations.
@@ -43,9 +41,9 @@
/**
* Constructor defining properties of this context.
*
- * @param classLoader the classloader for loading application resources
+ * @param classLoader the classloader for loading application resources
* @param scdlLocation the location of the SCDL defining this composite
- * @param componentId the id of the component being deployed
+ * @param componentId the id of the component being deployed
*/
protected AbstractDeploymentContext(ClassLoader classLoader, URL scdlLocation, URI componentId) {
this.classLoader = classLoader;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/AbstractCompositeComponent.java Wed Feb 21 22:42:01 2007
@@ -31,7 +31,6 @@
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.wire.TargetInvoker;
-import org.apache.tuscany.core.component.event.ComponentStart;
import org.apache.tuscany.core.component.event.ComponentStop;
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/composite/CompositeComponentTypeLoader.java Wed Feb 21 22:42:01 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.core.implementation.composite;
-import java.net.URL;
import java.net.URI;
+import java.net.URL;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
@@ -54,7 +54,7 @@
throws LoaderException {
URL scdlLocation = implementation.getScdlLocation();
ClassLoader cl = new CompositeClassLoader(implementation.getClassLoader());
- URI componentId = URI.create(deploymentContext.getComponentId().toString()+'/');
+ URI componentId = URI.create(deploymentContext.getComponentId().toString() + '/');
DeploymentContext childContext = new ChildDeploymentContext(deploymentContext, cl, scdlLocation, componentId);
CompositeComponentType componentType = loadFromSidefile(parent, scdlLocation, childContext);
implementation.setComponentType(componentType);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java Wed Feb 21 22:42:01 2007
@@ -59,7 +59,8 @@
type.setImplementationScope(org.apache.tuscany.spi.model.Scope.CONVERSATION);
} else if (scope != null && !"CONVERSATION".equals(scope.value().toUpperCase())) {
throw new InvalidConversationalImplementation(
- "Service is marked with @ConversationAttributes but the scope is not @Scope(\"CONVERSATION\")", clazz.getName());
+ "Service is marked with @ConversationAttributes but the scope is not @Scope(\"CONVERSATION\")",
+ clazz.getName());
} else if (conversation != null) {
long maxAge;
long maxIdleTime;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java Wed Feb 21 22:42:01 2007
@@ -23,7 +23,6 @@
import java.lang.reflect.Member;
import java.lang.reflect.Method;
-import static org.apache.tuscany.core.util.JavaIntrospectionHelper.toPropertyName;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
@@ -34,6 +33,8 @@
import org.apache.tuscany.spi.implementation.java.ProcessingException;
import org.apache.tuscany.spi.implementation.java.Resource;
+import static org.apache.tuscany.core.util.JavaIntrospectionHelper.toPropertyName;
+
/**
* Processes an {@link @Resource} annotation, updating the component type with corresponding {@link
* org.apache.tuscany.spi.implementation.java.Resource}
@@ -50,7 +51,8 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
- org.apache.tuscany.api.annotation.Resource annotation = method.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
+ org.apache.tuscany.api.annotation.Resource annotation =
+ method.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
if (annotation == null) {
return;
}
@@ -81,7 +83,8 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
- org.apache.tuscany.api.annotation.Resource annotation = field.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
+ org.apache.tuscany.api.annotation.Resource annotation =
+ field.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
if (annotation == null) {
return;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ServiceLoader.java Wed Feb 21 22:42:01 2007
@@ -67,7 +67,7 @@
String name = reader.getAttributeValue(null, "name");
URI targetUri = null;
URI compositeId = deploymentContext.getComponentId();
- URI componentBase = URI.create(compositeId +"/");
+ URI componentBase = URI.create(compositeId + "/");
ServiceDefinition def = new ServiceDefinition();
def.setUri(compositeId.resolve('#' + name));
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/ContributionDirectoryWatcher.java Wed Feb 21 22:42:01 2007
@@ -22,23 +22,26 @@
import java.io.File;
import java.io.IOException;
-import org.apache.tuscany.host.deployment.ContributionService;
-import org.apache.tuscany.host.deployment.DeploymentException;
-import org.apache.tuscany.spi.annotation.Autowire;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
+import org.apache.tuscany.spi.annotation.Autowire;
+
+import org.apache.tuscany.host.deployment.ContributionService;
+import org.apache.tuscany.host.deployment.DeploymentException;
+
@EagerInit
public class ContributionDirectoryWatcher {
private final String path;
private final ContributionService contributionService;
-
- public ContributionDirectoryWatcher(@Autowire ContributionService contributionService, @Property(name = "path")String path) {
+
+ public ContributionDirectoryWatcher(@Autowire ContributionService contributionService,
+ @Property(name = "path")String path) {
this.path = path;
this.contributionService = contributionService;
}
-
+
@Init
public void init() {
File extensionDir = new File(path);
@@ -49,12 +52,12 @@
File[] files = extensionDir.listFiles();
for (File file : files) {
- try{
+ try {
this.contributionService.contribute(file.toURL());
- }catch(DeploymentException de){
+ } catch (DeploymentException de) {
//FIXME handle this
de.printStackTrace();
- }catch(IOException ioe){
+ } catch (IOException ioe) {
//FIXME handle this
ioe.printStackTrace();
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessor.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessor.java Wed Feb 21 22:42:01 2007
@@ -29,13 +29,14 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import org.apache.tuscany.core.services.deployment.ContentTypeDescriberImpl;
-import org.apache.tuscany.host.deployment.DeploymentException;
import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
import org.apache.tuscany.spi.deployer.ContributionProcessor;
import org.apache.tuscany.spi.extension.ContributionProcessorExtension;
import org.apache.tuscany.spi.model.Contribution;
+import org.apache.tuscany.core.services.deployment.ContentTypeDescriberImpl;
+import org.apache.tuscany.host.deployment.DeploymentException;
+
public class JarContributionProcessor extends ContributionProcessorExtension implements ContributionProcessor {
public static final String CONTENT_TYPE = "application/x-compressed";
@@ -46,7 +47,7 @@
/**
* Get a list of selected resources by the extensions
- *
+ *
* @return
* @throws IOException
*/
@@ -85,7 +86,7 @@
public void processContent(Contribution contribution, URI source, InputStream inputStream)
throws DeploymentException, IOException {
- if(contribution == null){
+ if (contribution == null) {
throw new IllegalArgumentException("Invalid null contribution.");
}
@@ -104,14 +105,13 @@
for (URL artifactURL : getArtifacts(sourceURL, inputStream)) {
// FIXME
// contribution.addArtifact(artifact)
-
+
ContentTypeDescriber contentTypeDescriber = new ContentTypeDescriberImpl();
String contentType = contentTypeDescriber.getContentType(artifactURL, null);
System.out.println("Type : " + contentType);
-
//just process scdl for now
- if("application/v.tuscany.scdl".equals(contentType) || "application/java-vm".equals(contentType) ){
+ if ("application/v.tuscany.scdl".equals(contentType) || "application/java-vm".equals(contentType)) {
this.registry.processContent(contribution, source, inputStream);
}
// process each artifact
@@ -122,7 +122,7 @@
}
public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException,
- IOException {
+ IOException {
// TODO Auto-generated method stub
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessor.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessor.java Wed Feb 21 22:42:01 2007
@@ -24,76 +24,76 @@
import java.net.URI;
import java.net.URL;
-import org.apache.tuscany.host.deployment.DeploymentException;
+import org.osoa.sca.annotations.Constructor;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
import org.apache.tuscany.spi.deployer.ContributionProcessor;
import org.apache.tuscany.spi.extension.ContributionProcessorExtension;
import org.apache.tuscany.spi.implementation.java.IntrospectionRegistry;
-import org.apache.tuscany.spi.implementation.java.Introspector;
import org.apache.tuscany.spi.model.Contribution;
-import org.osoa.sca.annotations.Constructor;
-public class JavaContributionProcessor extends ContributionProcessorExtension implements ContributionProcessor{
+import org.apache.tuscany.host.deployment.DeploymentException;
+
+public class JavaContributionProcessor extends ContributionProcessorExtension implements ContributionProcessor {
public static final String CONTENT_TYPE = "application/java-vm";
- private Introspector introspector;
-
+ //private Introspector introspector;
+
+ @Constructor({"introspector"})
+ public JavaContributionProcessor(@Autowire IntrospectionRegistry introspector) {
+ //this.introspector = introspector;
+ }
+
@Override
public String getContentType() {
return CONTENT_TYPE;
}
-
- @Constructor({"introspector"})
- public JavaContributionProcessor(@Autowire IntrospectionRegistry introspector){
- this.introspector = introspector;
- }
-
- private String getClazzName(URL clazzURL){
+
+ private String getClazzName(URL clazzURL) {
String clazzName;
-
- clazzName = clazzURL.toExternalForm().substring(clazzURL.toExternalForm().lastIndexOf("!/") + 2,
- clazzURL.toExternalForm().length() - ".class".length());
+
+ clazzName = clazzURL.toExternalForm().substring(clazzURL.toExternalForm().lastIndexOf("!/") + 2,
+ clazzURL.toExternalForm().length() - ".class".length());
clazzName = clazzName.replace("/", ".");
-
+
return clazzName;
}
-
- public void processContent(Contribution contribution, URI source, InputStream inputStream)
- throws DeploymentException, IOException {
+
+ public void processContent(Contribution contribution, URI source, InputStream inputStream)
+ throws DeploymentException, IOException {
if (source == null) {
throw new IllegalArgumentException("Invalid null source uri.");
}
if (inputStream == null) {
throw new IllegalArgumentException("Invalid null source inputstream.");
- }
-
+ }
+
// TODO Auto-generated method stub
-
- try{
- CompositeClassLoader cl = new CompositeClassLoader(getClass().getClassLoader());
- cl.addURL(contribution.getLocation());
-
- String clazzName = getClazzName(contribution.getArtifact(source).getLocation());
- System.out.println(clazzName);
-
- Class clazz = cl.loadClass(clazzName);
-
+
+ //try {
+ CompositeClassLoader cl = new CompositeClassLoader(getClass().getClassLoader());
+ cl.addURL(contribution.getLocation());
+
+ String clazzName = getClazzName(contribution.getArtifact(source).getLocation());
+ System.out.println(clazzName);
+
+ //Class clazz = cl.loadClass(clazzName);
+
// PojoComponentType javaInfo = introspector.introspect(null, clazz, null, null);
- }catch(ClassNotFoundException cnfe){
- String msg = cnfe.getMessage();
-
- }
+// } catch (ClassNotFoundException cnfe) {
+// String msg = cnfe.getMessage();
+//
+// }
// catch(ProcessingException pe){
// String msg = pe.getMessage();
-
-
}
- public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException, IOException {
+ public void processModel(Contribution contribution, URI source, Object modelObject)
+ throws DeploymentException, IOException {
// TODO Auto-generated method stub
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/deployment/contribution/ScdlContributionProcessor.java Wed Feb 21 22:42:01 2007
@@ -22,70 +22,68 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
-
import javax.xml.stream.XMLInputFactory;
-import org.apache.tuscany.core.deployer.RootDeploymentContext;
-import org.apache.tuscany.host.deployment.ContributionProcessorException;
-import org.apache.tuscany.host.deployment.DeploymentException;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
import org.apache.tuscany.spi.deployer.ContributionProcessor;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.ContributionProcessorExtension;
-import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.CompositeComponentType;
-import org.apache.tuscany.spi.model.CompositeImplementation;
import org.apache.tuscany.spi.model.Contribution;
-public class ScdlContributionProcessor extends ContributionProcessorExtension implements ContributionProcessor{
+import org.apache.tuscany.host.deployment.DeploymentException;
+
+public class ScdlContributionProcessor extends ContributionProcessorExtension implements ContributionProcessor {
public static final String CONTENT_TYPE = "application/v.tuscany.scdl";
- private final LoaderRegistry registry;
-
+
protected XMLInputFactory xmlFactory;
-
+ //private final LoaderRegistry registry;
+
@Override
public String getContentType() {
return CONTENT_TYPE;
}
-
- public ScdlContributionProcessor(@Autowire LoaderRegistry registry){
+
+ public ScdlContributionProcessor(@Autowire LoaderRegistry registry) {
super();
- this.registry = registry;
+ //this.registry = registry;
this.xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
}
-
- public void processContent(Contribution contribution, URI source, InputStream inputStream)
- throws DeploymentException, IOException {
+
+ public void processContent(Contribution contribution, URI source, InputStream inputStream)
+ throws DeploymentException, IOException {
if (source == null) {
throw new IllegalArgumentException("Invalid null source uri.");
}
if (inputStream == null) {
throw new IllegalArgumentException("Invalid null source inputstream.");
- }
-
- try{
- CompositeClassLoader cl = new CompositeClassLoader(getClass().getClassLoader());
- cl.addURL(contribution.getLocation());
- DeploymentContext deploymentContext = new RootDeploymentContext(cl, contribution.getArtifact(source).getLocation(), source, this.xmlFactory, null );
-
- CompositeComponentType componentType = this.registry.load(null, null, contribution.getArtifact(source).getLocation(), CompositeComponentType.class, deploymentContext);
-
- //FIXME add this to artifact
- CompositeImplementation implementation = new CompositeImplementation();
- ComponentDefinition<CompositeImplementation> componentDefinition = new ComponentDefinition<CompositeImplementation>(implementation);
-
- }catch(LoaderException le){
- le.printStackTrace();
- throw new ContributionProcessorException("Error processing SCDL", contribution.getArtifact(source).getLocation().toExternalForm(), le);
}
+
+ //try {
+ CompositeClassLoader cl = new CompositeClassLoader(getClass().getClassLoader());
+ cl.addURL(contribution.getLocation());
+// DeploymentContext deploymentContext = new RootDeploymentContext(cl,
+// contribution.getArtifact(source).getLocation(), source, this.xmlFactory, null);
+
+ // CompositeComponentType componentType = this.registry.load(null, null,
+ // contribution.getArtifact(source).getLocation(), CompositeComponentType.class, deploymentContext);
+
+ //FIXME add this to artifact
+// CompositeImplementation implementation = new CompositeImplementation();
+// ComponentDefinition<CompositeImplementation> componentDefinition =
+// new ComponentDefinition<CompositeImplementation>(implementation);
+
+// } catch (LoaderException le) {
+// le.printStackTrace();
+// throw new ContributionProcessorException("Error processing SCDL",
+// contribution.getArtifact(source).getLocation().toExternalForm(), le);
+// }
}
- public void processModel(Contribution contribution, URI source, Object modelObject) throws DeploymentException, IOException {
+ public void processModel(Contribution contribution, URI source, Object modelObject)
+ throws DeploymentException, IOException {
// TODO Auto-generated method stub
}
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/FileHelper.java Wed Feb 21 22:42:01 2007
@@ -272,7 +272,7 @@
} else {
String filename = url.getFile().replace('/', File.separatorChar);
int pos = 0;
- while ((pos = filename.indexOf('%', pos)) >= 0) {
+ while ((pos = filename.indexOf('%', pos)) >= 0) { // NOPMD
if (pos + 2 < filename.length()) {
String hexStr = filename.substring(pos + 1, pos + 3);
char ch = (char) Integer.parseInt(hexStr, 16);
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/util/IOHelper.java Wed Feb 21 22:42:01 2007
@@ -28,18 +28,18 @@
* The default buffer size to use.
*/
private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
-
+
protected IOHelper() {
-
+
}
/**
* Unconditionally close an <code>InputStream</code>.
- * <p>
- * Equivalent to {@link InputStream#close()}, except any exceptions will be ignored.
- * This is typically used in finally blocks.
+ * <p/>
+ * Equivalent to {@link InputStream#close()}, except any exceptions will be ignored. This is typically used in
+ * finally blocks.
*
- * @param input the InputStream to close, may be null or already closed
+ * @param input the InputStream to close, may be null or already closed
*/
public static void closeQuietly(InputStream input) {
try {
@@ -50,14 +50,14 @@
// ignore
}
}
-
+
/**
* Unconditionally close an <code>OutputStream</code>.
- * <p>
- * Equivalent to {@link OutputStream#close()}, except any exceptions will be ignored.
- * This is typically used in finally blocks.
+ * <p/>
+ * Equivalent to {@link OutputStream#close()}, except any exceptions will be ignored. This is typically used in
+ * finally blocks.
*
- * @param output the OutputStream to close, may be null or already closed
+ * @param output the OutputStream to close, may be null or already closed
*/
public static void closeQuietly(OutputStream output) {
try {
@@ -68,26 +68,24 @@
// ignore
}
}
-
+
/**
- * Copy bytes from an <code>InputStream</code> to an
- * <code>OutputStream</code>.
- * <p>
- * This method buffers the input internally, so there is no need to use a
- * <code>BufferedInputStream</code>.
+ * Copy bytes from an <code>InputStream</code> to an <code>OutputStream</code>.
+ * <p/>
+ * This method buffers the input internally, so there is no need to use a <code>BufferedInputStream</code>.
*
* @param input the <code>InputStream</code> to read from
- * @param output the <code>OutputStream</code> to write to
+ * @param output the <code>OutputStream</code> to write to
* @return the number of bytes copied
* @throws NullPointerException if the input or output is null
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
* @since Commons IO 1.1
*/
public static int copy(InputStream input, OutputStream output) throws IOException {
byte[] buffer = new byte[DEFAULT_BUFFER_SIZE];
int count = 0;
int n = 0;
- while (-1 != (n = input.read(buffer))) {
+ while (-1 != (n = input.read(buffer))) { //NOPMD
output.write(buffer, 0, n);
count += n;
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/BuilderRegistryTestCase.java Wed Feb 21 22:42:01 2007
@@ -47,7 +47,6 @@
import org.apache.tuscany.spi.model.ServiceDefinition;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.ComponentManager;
import org.easymock.EasyMock;
/**
@@ -81,7 +80,7 @@
EasyMock.expect(components.put(componentId, component)).andReturn(null);
EasyMock.replay(components);
-
+
ComponentBuilder builder = EasyMock.createMock(ComponentBuilder.class);
EasyMock.expect(builder.build(parent, componentDefinition, deploymentContext)).andReturn(component);
EasyMock.replay(builder);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/JavaObjectRegistrationTestCase.java Wed Feb 21 22:42:01 2007
@@ -36,7 +36,7 @@
public void testRegistration() throws Exception {
MockComponent instance = new MockComponent();
URI uri = URI.create("foo");
- ServiceContract<MockComponent> contract = new ServiceContract<MockComponent>(MockComponent.class){
+ ServiceContract<MockComponent> contract = new ServiceContract<MockComponent>(MockComponent.class) {
};
componentManager.registerJavaObject(uri, contract, instance);
Component component = componentManager.getComponent(URI.create("foo"));
@@ -48,11 +48,11 @@
public void testDuplicateRegistration() throws Exception {
MockComponent instance = new MockComponent();
URI uri = URI.create("foo");
- ServiceContract<MockComponent> contract = new ServiceContract<MockComponent>(MockComponent.class){
+ ServiceContract<MockComponent> contract = new ServiceContract<MockComponent>(MockComponent.class) {
};
componentManager.registerJavaObject(uri, contract, instance);
try {
- componentManager.registerJavaObject(uri,contract, instance);
+ componentManager.registerJavaObject(uri, contract, instance);
fail();
} catch (DuplicateNameException e) {
// ok
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/PojoAtomicComponentTestCase.java Wed Feb 21 22:42:01 2007
@@ -22,8 +22,8 @@
import org.apache.tuscany.spi.ObjectFactory;
import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.TargetInvokerCreationException;
import org.apache.tuscany.spi.model.Operation;
import org.apache.tuscany.spi.model.Scope;
import org.apache.tuscany.spi.wire.TargetInvoker;
@@ -180,7 +180,7 @@
public Foo() {
}
- public void setCallback(Object callback){
+ public void setCallback(Object callback) {
}
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeBuilderTestCase.java Wed Feb 21 22:42:01 2007
@@ -22,9 +22,9 @@
import java.util.Map;
import org.apache.tuscany.spi.component.AtomicComponent;
+import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.ScopeContainerMonitor;
-import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.spi.idl.java.JavaServiceContract;
@@ -46,7 +46,6 @@
import org.apache.tuscany.core.binding.local.LocalBindingBuilder;
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
-import org.apache.tuscany.core.component.ComponentManagerImpl;
import org.apache.tuscany.core.component.scope.CompositeScopeContainer;
import org.apache.tuscany.core.deployer.RootDeploymentContext;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
@@ -64,7 +63,6 @@
*/
public class CompositeBuilderTestCase extends TestCase {
private static final URI TOP_COMPONENT = URI.create("Top");
- private static final URI PARENT_COMPONENT = URI.create("Top/Parent");
private static final URI SOURCE_COMPONENT = URI.create("Top/Parent/SourceComponent");
private static final URI TARGET_COMPONENT = URI.create("Top/Parent/TargetComponent");
private static final URI INNER_SOURCE_COMPONENT = URI.create("Top/Parent/SourceComponent/InnerSourceComponent");
@@ -83,7 +81,7 @@
CompositeComponent component =
(CompositeComponent) builder.build(null, createTopComponentDef(), deploymentContext);
- Map<URI,Component> components = deploymentContext.getComponents();
+ Map<URI, Component> components = deploymentContext.getComponents();
CompositeComponent sourceComponent = (CompositeComponent) components.get(SOURCE_COMPONENT);
assertNotNull(sourceComponent.getService("InnerSourceService"));
AtomicComponent innerSourceComponent = (AtomicComponent) components.get(INNER_SOURCE_COMPONENT);
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/composite/CompositeComponentImplTestCase.java Wed Feb 21 22:42:01 2007
@@ -29,12 +29,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.tuscany.core.component.event.ComponentStart;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.isA;
import static org.easymock.EasyMock.replay;
/**
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/loader/ComponentLoaderRefTestCase.java Wed Feb 21 22:42:01 2007
@@ -19,8 +19,6 @@
package org.apache.tuscany.core.loader;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContributionServiceImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContributionServiceImplTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContributionServiceImplTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/ContributionServiceImplTestCase.java Wed Feb 21 22:42:01 2007
@@ -19,31 +19,26 @@
package org.apache.tuscany.core.services.deployment;
-import java.net.URI;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.services.deployment.contribution.JarContributionProcessor;
-import org.apache.tuscany.core.services.deployment.contribution.JavaContributionProcessor;
-import org.apache.tuscany.host.deployment.ContributionService;
import org.apache.tuscany.spi.deployer.ContentTypeDescriber;
import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
import org.apache.tuscany.spi.deployer.ContributionRepository;
+import junit.framework.TestCase;
+import org.apache.tuscany.host.deployment.ContributionService;
+
/**
* This is more intended to be a integration test then a unit test. *
*/
public class ContributionServiceImplTestCase extends TestCase {
private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
- private ContributionRepository repository;
+ private ContributionRepository repository;
private ContentTypeDescriber contentTypeDescriber;
private ContributionProcessorRegistry registry;
private ContributionService contributionService;
-
+
protected void setUp() throws Exception {
super.setUp();
-
+
// this.repository = new ContributionRepositoryImpl("target/repository");
//
// this.contentTypeDescriber = new ContentTypeDescriberImpl();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessorTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JarContributionProcessorTestCase.java Wed Feb 21 22:42:01 2007
@@ -18,22 +18,15 @@
*/
package org.apache.tuscany.core.services.deployment.contribution;
-import java.net.URI;
-import java.net.URL;
-
import junit.framework.TestCase;
-import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
-import org.apache.tuscany.spi.model.Contribution;
-import org.easymock.EasyMock;
-
public class JarContributionProcessorTestCase extends TestCase {
private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
protected void setUp() throws Exception {
super.setUp();
}
-
+
public final void testProcessJarArtifacts() throws Exception {
/*
JarContributionProcessor jarContribution = new JarContributionProcessor();
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessorTestCase.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/JavaContributionProcessorTestCase.java Wed Feb 21 22:42:01 2007
@@ -22,8 +22,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
-import junit.framework.TestCase;
+import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
+import junit.framework.TestCase;
import org.apache.tuscany.core.idl.java.JavaInterfaceProcessorRegistryImpl;
import org.apache.tuscany.core.implementation.IntrospectionRegistryImpl;
import org.apache.tuscany.core.implementation.processor.DestroyProcessor;
@@ -34,13 +35,13 @@
import org.apache.tuscany.core.implementation.processor.ResourceProcessor;
import org.apache.tuscany.core.implementation.processor.ScopeProcessor;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
public class JavaContributionProcessorTestCase extends TestCase {
private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
- private static final String JAVA_ARTIFACT_URL = "jar:file://repository/sample-calculator.jar!/calculator/AddService.class" ;
+ private static final String JAVA_ARTIFACT_URL =
+ "jar:file://repository/sample-calculator.jar!/calculator/AddService.class";
private IntrospectionRegistryImpl registry;
-
+
protected void setUp() throws Exception {
super.setUp();
registry = new IntrospectionRegistryImpl();
@@ -54,17 +55,17 @@
registry.registerProcessor(new ReferenceProcessor(interfaceProcessorRegistry));
registry.registerProcessor(new ResourceProcessor());
}
-
- protected URL getClassURL() throws Exception{
+
+ protected URL getClassURL() throws Exception {
URL jarURL = getClass().getResource(JAR_CONTRIBUTION);
JarInputStream jar = new JarInputStream(getClass().getResourceAsStream(JAR_CONTRIBUTION));
- URL rootURL = new URL("jar:" + jarURL.toString() + "!/");
+ URL rootURL = new URL("jar:" + jarURL.toString() + "!/");
URL classURL = null;
-
+
try {
while (true) {
JarEntry entry = jar.getNextJarEntry();
- if(entry.getName().endsWith(".class")){
+ if (entry.getName().endsWith(".class")) {
classURL = new URL(rootURL, entry.getName());
break;
@@ -78,7 +79,7 @@
public final void testProcessJarArtifacts() throws Exception {
//ContributionProcessor javaContributionProcessor = new JavaContributionProcessor(registry);
-
+
//URL jarURL = this.getClassURL();
//javaContributionProcessor.processContent(null, jarURL, jarURL.openStream());
}
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentContext.java Wed Feb 21 22:42:01 2007
@@ -18,14 +18,13 @@
*/
package org.apache.tuscany.spi.deployer;
-import java.net.URL;
import java.net.URI;
-import java.util.List;
+import java.net.URL;
import java.util.Map;
import javax.xml.stream.XMLInputFactory;
-import org.apache.tuscany.spi.component.ScopeContainer;
import org.apache.tuscany.spi.component.Component;
+import org.apache.tuscany.spi.component.ScopeContainer;
/**
* A holder that can be used during the load process to store information that is not part of the logical assembly
Modified: incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java?view=diff&rev=510419&r1=510418&r2=510419
==============================================================================
--- incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/kernel/spi/src/main/java/org/apache/tuscany/spi/extension/ContributionProcessorExtension.java Wed Feb 21 22:42:01 2007
@@ -19,25 +19,26 @@
package org.apache.tuscany.spi.extension;
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.deployer.ContributionProcessor;
-import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
import org.osoa.sca.annotations.Destroy;
import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Service;
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.deployer.ContributionProcessor;
+import org.apache.tuscany.spi.deployer.ContributionProcessorRegistry;
+
/**
* The base class for ContributionProcessor implementations
- *
+ *
* @version $Rev$ $Date$
*/
@EagerInit
@Service(ContributionProcessor.class)
public abstract class ContributionProcessorExtension implements ContributionProcessor {
/**
- * The ContributionProcessorRegistry that this processor should register with; usually set by injection. This registry may also be used to process
- * other sub-artifacts.
+ * The ContributionProcessorRegistry that this processor should register with; usually set by injection. This
+ * registry may also be used to process other sub-artifacts.
*/
protected ContributionProcessorRegistry registry;
@@ -48,17 +49,17 @@
public void setContributionProcessorRegistry(ContributionProcessorRegistry registry) {
this.registry = registry;
}
-
+
/**
- * Initialize the processor. It registers itself to the registry by content type it supports.
- */
+ * Initialize the processor. It registers itself to the registry by content type it supports.
+ */
@Init
public void start() {
registry.register(this.getContentType(), this);
}
/**
- * Destroy the processor. It unregisters itself from the registry.
+ * Destroy the processor. It unregisters itself from the registry.
*/
@Destroy
public void stop() {
@@ -67,7 +68,7 @@
/**
* Returns the content type that this implementation can handle.
- *
+ *
* @return the content type that this implementation can handle
*/
public abstract String getContentType();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org