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/03/05 03:44:57 UTC
svn commit: r514528 - in /incubator/tuscany/java/sca/kernel/core/src:
main/java/org/apache/tuscany/core/builder/
main/java/org/apache/tuscany/core/loader/
main/java/org/apache/tuscany/core/services/deployment/
main/java/org/apache/tuscany/core/services...
Author: lresende
Date: Sun Mar 4 18:44:56 2007
New Revision: 514528
URL: http://svn.apache.org/viewvc?view=rev&rev=514528
Log:
PMD & CheckStyle
Modified:
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/loader/ComponentLoader.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/ScdlContributionProcessor.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/FolderContributionProcessorTestCase.java
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=514528&r1=514527&r2=514528
==============================================================================
--- 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 Sun Mar 4 18:44:56 2007
@@ -59,8 +59,7 @@
public class BuilderRegistryImpl implements BuilderRegistry {
private ScopeRegistry scopeRegistry;
- private final Map<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>>
- componentBuilders =
+ private final Map<Class<? extends Implementation<?>>, ComponentBuilder<? extends Implementation<?>>> 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/loader/ComponentLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java?view=diff&rev=514528&r1=514527&r2=514528
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/loader/ComponentLoader.java Sun Mar 4 18:44:56 2007
@@ -68,7 +68,6 @@
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ReferenceTarget;
import org.apache.tuscany.spi.model.ServiceDefinition;
-import org.apache.tuscany.spi.util.stax.StaxUtil;
import org.apache.tuscany.core.binding.local.LocalBindingDefinition;
import org.apache.tuscany.core.deployer.ChildDeploymentContext;
@@ -318,7 +317,7 @@
if (target == null) {
throw new MissingReferenceException(name);
}
- if (target.isAutowire()){
+ if (target.isAutowire()) {
// autowire targets are not set yet
continue;
}
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=514528&r1=514527&r2=514528
==============================================================================
--- 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 Sun Mar 4 18:44:56 2007
@@ -33,10 +33,11 @@
@EagerInit
public class ContributionDirectoryWatcher {
private final String path;
+
private final ContributionService contributionService;
- public ContributionDirectoryWatcher(@Reference ContributionService contributionService,
- @Property(name = "path")String path) {
+ public ContributionDirectoryWatcher(@Reference ContributionService contributionService,
+ @Property(name = "path") String path) {
this.path = path;
this.contributionService = contributionService;
}
@@ -52,15 +53,16 @@
File[] files = extensionDir.listFiles();
for (File file : files) {
try {
- if (file.isDirectory())
+ if (file.isDirectory()) {
this.contributionService.contribute(file.toURL(), false);
- else
+ } else {
this.contributionService.contribute(file.toURL(), true);
+ }
} catch (DeploymentException de) {
- //FIXME handle this
+ // FIXME handle this
de.printStackTrace();
} catch (IOException ioe) {
- //FIXME handle this
+ // FIXME handle this
ioe.printStackTrace();
}
}
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=514528&r1=514527&r2=514528
==============================================================================
--- 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 Sun Mar 4 18:44:56 2007
@@ -46,19 +46,20 @@
private final LoaderRegistry registry;
- protected XMLInputFactory xmlFactory;
-
- @Override
- public String getContentType() {
- return CONTENT_TYPE;
- }
+ private final XMLInputFactory xmlFactory;
public ScdlContributionProcessor(@Reference LoaderRegistry registry) {
super();
this.registry = registry;
this.xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", getClass().getClassLoader());
}
+
+ @Override
+ public String getContentType() {
+ return CONTENT_TYPE;
+ }
+
public void processContent(Contribution contribution, URI source, InputStream inputStream)
throws DeploymentException, IOException {
if (source == null) {
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/FolderContributionProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/FolderContributionProcessorTestCase.java?view=diff&rev=514528&r1=514527&r2=514528
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/FolderContributionProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/services/deployment/contribution/FolderContributionProcessorTestCase.java Sun Mar 4 18:44:56 2007
@@ -19,38 +19,32 @@
package org.apache.tuscany.core.services.deployment.contribution;
import java.io.File;
-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 FolderContributionProcessorTestCase extends TestCase {
- private static final String DIRECTORY_CONTRIBUTION = "//D:/DEV/Projects/Tuscany/source/java-sca-integration/samples/sca/calculator";
-
+ private static final String DIRECTORY_CONTRIBUTION =
+ "//D:/DEV/Projects/Tuscany/source/java-sca-integration/samples/sca/calculator";
+
private File contributionRoot;
-
protected void setUp() throws Exception {
super.setUp();
this.contributionRoot = new File(DIRECTORY_CONTRIBUTION);
}
-
+
public final void testProcessJarArtifacts() throws Exception {
-// FolderContributionProcessor folderContribution = new FolderContributionProcessor();
-// ContributionProcessorRegistry mockRegistry = EasyMock.createMock(ContributionProcessorRegistry.class);
-// mockRegistry.register(FolderContributionProcessor.CONTENT_TYPE, folderContribution);
-// EasyMock.expectLastCall().anyTimes();
-// EasyMock.replay(mockRegistry);
-// folderContribution.setContributionProcessorRegistry(mockRegistry);
-// folderContribution.start();
-// EasyMock.verify(mockRegistry);
-//
-// Contribution contribution = new Contribution(URI.create("sca://contributions/001"));
-// contribution.setLocation(this.contributionRoot.toURL());
-// folderContribution.processContent(contribution, contribution.getUri(), null);
+ // FolderContributionProcessor folderContribution = new FolderContributionProcessor();
+ // ContributionProcessorRegistry mockRegistry = EasyMock.createMock(ContributionProcessorRegistry.class);
+ // mockRegistry.register(FolderContributionProcessor.CONTENT_TYPE, folderContribution);
+ // EasyMock.expectLastCall().anyTimes();
+ // EasyMock.replay(mockRegistry);
+ // folderContribution.setContributionProcessorRegistry(mockRegistry);
+ // folderContribution.start();
+ // EasyMock.verify(mockRegistry);
+ //
+ // Contribution contribution = new Contribution(URI.create("sca://contributions/001"));
+ // contribution.setLocation(this.contributionRoot.toURL());
+ // folderContribution.processContent(contribution, contribution.getUri(), null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org