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 2006/08/09 20:57:00 UTC
svn commit: r430115 - in /incubator/tuscany/java/sca/core/src:
main/java/org/apache/tuscany/core/implementation/processor/
main/java/org/apache/tuscany/core/launcher/
main/java/org/apache/tuscany/core/loader/
main/java/org/apache/tuscany/core/policy/as...
Author: jmarino
Date: Wed Aug 9 11:56:58 2006
New Revision: 430115
URL: http://svn.apache.org/viewvc?rev=430115&view=rev
Log:
checkstyle cleanup
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/artifact/LocalMavenRepository.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java Wed Aug 9 11:56:58 2006
@@ -248,7 +248,6 @@
paramNames.add(name);
}
}
-
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java Wed Aug 9 11:56:58 2006
@@ -18,39 +18,39 @@
import java.io.File;
import java.net.URL;
-
import javax.xml.stream.XMLInputFactory;
+import org.apache.tuscany.spi.bootstrap.ComponentNames;
+import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeImplementation;
-import org.apache.tuscany.spi.bootstrap.ComponentNames;
-import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
-import org.apache.tuscany.spi.services.info.RuntimeInfo;
import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.spi.services.info.RuntimeInfo;
+
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
-import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
+import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
/**
* Basic launcher implementation.
- *
+ *
* @version $Rev: 417136 $ $Date: 2006-06-26 03:54:48 -0400 (Mon, 26 Jun 2006) $
*/
public class Launcher {
/**
* A conventional META-INF based location for the system SCDL.
- *
+ *
* @see #bootRuntime(URL, MonitorFactory)
*/
public static final String METAINF_SYSTEM_SCDL_PATH = "META-INF/tuscany/system.scdl";
/**
* A conventional META-INF based location for the application SCDL.
- *
+ *
* @see #bootApplication(URL)
*/
public static final String METAINF_APPLICATION_SCDL_PATH = "META-INF/sca/default.scdl";
@@ -65,7 +65,7 @@
/**
* Returns the classloader for application classes.
- *
+ *
* @return the classloader for application classes
*/
public ClassLoader getApplicationLoader() {
@@ -73,11 +73,10 @@
}
/**
- * Set the classloader to be used for application classes. You should almost always supply your own application classloader, based on the hosting
- * environment that the runtime is embedded in.
- *
- * @param applicationLoader
- * the classloader to be used for application classes
+ * Set the classloader to be used for application classes. You should almost always supply your own application
+ * classloader, based on the hosting environment that the runtime is embedded in.
+ *
+ * @param applicationLoader the classloader to be used for application classes
*/
public void setApplicationLoader(ClassLoader applicationLoader) {
this.applicationLoader = applicationLoader;
@@ -85,9 +84,8 @@
/**
* Boots the runtime defined by the specified SCDL.
- *
- * @param systemScdl
- * a resource path to the SCDL defining the system.
+ *
+ * @param systemScdl a resource path to the SCDL defining the system.
* @return a CompositeComponent for the newly booted runtime system
* @throws LoaderException
*/
@@ -114,7 +112,8 @@
SystemCompositeImplementation moduleImplementation = new SystemCompositeImplementation();
moduleImplementation.setScdlLocation(systemScdl);
moduleImplementation.setClassLoader(systemClassLoader);
- ComponentDefinition<SystemCompositeImplementation> moduleDefinition = new ComponentDefinition<SystemCompositeImplementation>(
+ ComponentDefinition<SystemCompositeImplementation> moduleDefinition =
+ new ComponentDefinition<SystemCompositeImplementation>(
ComponentNames.TUSCANY_SYSTEM, moduleImplementation);
// deploy the component into the runtime under the system parent
@@ -144,12 +143,11 @@
/**
* Boots the application defined by the specified SCDL.
- *
- * @see METAINF_APPLICATION_SCDL_PATH
- * @param appScdl
- * URL to the SCDL defining the application
+ *
+ * @param appScdl URL to the SCDL defining the application
* @return a CompositeComponent for the newly booted application
* @throws LoaderException
+ * @see METAINF_APPLICATION_SCDL_PATH
*/
public CompositeComponent<?> bootApplication(URL appScdl) throws LoaderException {
if (appScdl == null) {
@@ -161,13 +159,14 @@
CompositeImplementation impl = new CompositeImplementation();
impl.setScdlLocation(appScdl);
impl.setClassLoader(applicationLoader);
- ComponentDefinition<CompositeImplementation> moduleDefinition = new ComponentDefinition<CompositeImplementation>(
+ ComponentDefinition<CompositeImplementation> moduleDefinition =
+ new ComponentDefinition<CompositeImplementation>(
ComponentNames.TUSCANY_SYSTEM, impl);
// deploy the component into the runtime under the system parent
CompositeComponent parent = runtime.getRootComponent();
ClassLoader ccl = Thread.currentThread().getContextClassLoader();
-
+
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/ReferenceLoader.java Wed Aug 9 11:56:58 2006
@@ -25,18 +25,18 @@
import static org.osoa.sca.Version.XML_NAMESPACE_1_0;
import org.osoa.sca.annotations.Constructor;
+import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
+import org.apache.tuscany.spi.model.Binding;
+import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.ModelObject;
import org.apache.tuscany.spi.model.Multiplicity;
import org.apache.tuscany.spi.model.ReferenceDefinition;
import org.apache.tuscany.spi.model.ServiceContract;
-import org.apache.tuscany.spi.model.Binding;
-import org.apache.tuscany.spi.model.BoundReferenceDefinition;
-import org.apache.tuscany.spi.annotation.Autowire;
/**
* Loads a reference from an XML-based assembly file
@@ -63,7 +63,8 @@
assert REFERENCE.equals(reader.getName());
String name = reader.getAttributeValue(null, "name");
- Multiplicity multiplicity = StAXUtil.multiplicity(reader.getAttributeValue(null, "multiplicity"), Multiplicity.ONE_ONE);
+ Multiplicity multiplicity =
+ StAXUtil.multiplicity(reader.getAttributeValue(null, "multiplicity"), Multiplicity.ONE_ONE);
Binding binding = null;
ServiceContract serviceContract = null;
while (true) {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncInterceptor.java Wed Aug 9 11:56:58 2006
@@ -1,12 +1,10 @@
package org.apache.tuscany.core.policy.async;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
-
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.SCA;
-import org.osoa.sca.ServiceRuntimeException;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageChannel;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/artifact/LocalMavenRepository.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/artifact/LocalMavenRepository.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/artifact/LocalMavenRepository.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/artifact/LocalMavenRepository.java Wed Aug 9 11:56:58 2006
@@ -22,7 +22,6 @@
import java.security.PrivilegedAction;
import java.util.Collection;
-import org.osoa.sca.annotations.Constructor;
import org.osoa.sca.annotations.Property;
import org.apache.tuscany.spi.services.artifact.Artifact;
@@ -37,12 +36,12 @@
private File localRepo;
/**
- * Constructor specifying the location of the local repo.
- * Relative paths are resolved against the user's home directory.
+ * Constructor specifying the location of the local repo. Relative paths are resolved against the user's home
+ * directory.
*
* @param repoPath the path to the local repo
*/
- public LocalMavenRepository(@Property(name="repository") String repoPath) {
+ public LocalMavenRepository(@Property(name = "repository") String repoPath) {
String home = AccessController.doPrivileged(new PrivilegedAction<String>() {
public String run() {
return System.getProperty("user.home");
@@ -55,7 +54,7 @@
if (artifact.getUrl() != null) {
return;
}
-
+
String path = getPath(artifact);
File artifactFile = new File(localRepo, path);
if (artifactFile.exists()) {
@@ -69,9 +68,8 @@
}
/**
- * Return the path into the repo for an artifact.
- * The path for an artifact is
- * ${group.replace('.', '/')}/$[name}/${version}/${name}-${version}[-${classifier}].${type}
+ * Return the path into the repo for an artifact. The path for an artifact is ${group.replace('.',
+ * '/')}/$[name}/${version}/${name}-${version}[-${classifier}].${type}
*
* @param artifact the artifact to resolve
* @return the path into the repo for the artifact
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java Wed Aug 9 11:56:58 2006
@@ -19,23 +19,23 @@
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLClassLoader;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
-import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.spi.TuscanyException;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.deployer.CompositeClassLoader;
+import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.services.VoidService;
import org.apache.tuscany.spi.services.info.RuntimeInfo;
+import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
+
/**
* Service that extends the runtime by loading composites located in a directory.
*
@@ -111,7 +111,7 @@
implementation.setScdlLocation(scdl);
implementation.setClassLoader(extensionCL);
ComponentDefinition<SystemCompositeImplementation> definition =
- new ComponentDefinition<SystemCompositeImplementation>(name, implementation);
+ new ComponentDefinition<SystemCompositeImplementation>(name, implementation);
try {
Component<?> component = deployer.deploy(parent, definition);
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java?rev=430115&r1=430114&r2=430115&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/policy/async/AsyncInterceptorTestCase.java Wed Aug 9 11:56:58 2006
@@ -2,19 +2,19 @@
import java.util.concurrent.CountDownLatch;
+import org.apache.tuscany.spi.services.work.WorkScheduler;
import org.apache.tuscany.spi.wire.Interceptor;
import org.apache.tuscany.spi.wire.Message;
import org.apache.tuscany.spi.wire.MessageImpl;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
+import org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler;
+import org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager;
import org.jmock.Mock;
import org.jmock.MockObjectTestCase;
import org.jmock.core.Invocation;
import org.jmock.core.Stub;
-import org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager;
-import org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler;
-import org.apache.tuscany.spi.services.work.WorkScheduler;
/**
* Verfies basic async invocations
*
@@ -22,7 +22,7 @@
*/
public class AsyncInterceptorTestCase extends MockObjectTestCase {
- private WorkScheduler workScheduler;
+ private WorkScheduler workScheduler;
private ThreadPoolWorkManager workManager;
@SuppressWarnings("unchecked")
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org