Author: jmarino
Date: Fri May 5 13:24:34 2006
New Revision: 400166
URL: http://svn.apache.org/viewcvs?rev=400166&view=rev
Log:
refactor of spi to include only interfaces
Added:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java
(contents, props changed)
- copied, changed from r400113,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java
(contents, props changed)
- copied, changed from r400113,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java?rev=400166&r1=400165&r2=400166&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
Fri May 5 13:24:34 2006
@@ -23,7 +23,8 @@
private final Map<AtomicContext, Map<Thread, InstanceContext>> contexts;
private final Map<Thread, List<InstanceContext>> destroyQueues;
- //flip Thread, Map<AtomicContext,InstanceContext>
+ //flip Thread, Map<AtomicContext,InstanceContext>
+
public RequestScopeContext(WorkContext workContext) {
super("Request Scope", workContext);
contexts = new ConcurrentHashMap<AtomicContext, Map<Thread,
InstanceContext>>();
Copied:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java
(from r400113,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java)
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java&r1=400113&r2=400166&rev=400166&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java
Fri May 5 13:24:34 2006
@@ -11,19 +11,21 @@
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
-package org.apache.tuscany.spi.wire;
+package org.apache.tuscany.core.wire;
import java.lang.reflect.Method;
import java.util.Map;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.WireSourceConfiguration;
+import org.apache.tuscany.spi.wire.SourceInvocationConfiguration;
/**
* Contains configuration for the source side of a wire
*
* @version $Rev: 394379 $ $Date: 2006-04-15 15:01:36 -0700 (Sat, 15 Apr 2006)
$
*/
-public class WireSourceConfiguration {
+public class WireSourceConfigurationImpl implements WireSourceConfiguration {
private String referenceName;
protected Map<Method, SourceInvocationConfiguration> configurations;
@@ -37,8 +39,8 @@
* @param targetName the qualified name of the target service
specified by the wire
* @param invocationConfigs a collection of service
operation-to-invocation chain mappings
*/
- public WireSourceConfiguration(String referenceName, QualifiedName
targetName,
- Map<Method, SourceInvocationConfiguration>
invocationConfigs) {
+ public WireSourceConfigurationImpl(String referenceName, QualifiedName
targetName,
+ Map<Method,
SourceInvocationConfiguration> invocationConfigs) {
this.targetName = targetName;
this.referenceName = referenceName;
this.configurations = invocationConfigs;
@@ -50,29 +52,19 @@
* @param targetName the qualified name of the target service
specified by the wire
* @param invocationConfigs a collection of service
operation-to-invocation chain mappings
*/
- public WireSourceConfiguration(QualifiedName targetName, Map<Method,
SourceInvocationConfiguration> invocationConfigs) {
+ public WireSourceConfigurationImpl(QualifiedName targetName, Map<Method,
SourceInvocationConfiguration> invocationConfigs) {
this(null, targetName, invocationConfigs);
}
- /**
- * Returns the qualified name of the target service specified by the wire
- */
public QualifiedName getTargetName() {
return targetName;
}
- /**
- * Returns the invocation configuration for each operation on a service
specified by a reference or a
- * target service.
- */
public Map<Method, SourceInvocationConfiguration>
getInvocationConfigurations() {
return configurations;
}
- /**
- * Returns the name of the source reference
- */
public String getReferenceName() {
return referenceName;
}
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireSourceConfigurationImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Copied:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java
(from r400113,
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java)
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java?p2=incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java&p1=incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java&r1=400113&r2=400166&rev=400166&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java
Fri May 5 13:24:34 2006
@@ -1,16 +1,18 @@
-package org.apache.tuscany.spi.wire;
+package org.apache.tuscany.core.wire;
import java.lang.reflect.Method;
import java.util.Map;
import org.apache.tuscany.spi.QualifiedName;
+import org.apache.tuscany.spi.wire.WireTargetConfiguration;
+import org.apache.tuscany.spi.wire.TargetInvocationConfiguration;
/**
* Contains configuration for the target side of a wire
*
* @version $$Rev$$ $$Date$$
*/
-public class WireTargetConfiguration {
+public class WireTargetConfigurationImpl implements WireTargetConfiguration {
protected Map<Method, TargetInvocationConfiguration> configurations;
protected QualifiedName targetName;
@@ -22,24 +24,17 @@
* @param targetName the qualified name of the target service
specified by the wire
* @param invocationConfigs a collection of target service
operation-to-invocation chain mappings
*/
- public WireTargetConfiguration(QualifiedName targetName, Map<Method,
TargetInvocationConfiguration> invocationConfigs) {
+ public WireTargetConfigurationImpl(QualifiedName targetName, Map<Method,
TargetInvocationConfiguration> invocationConfigs) {
assert (invocationConfigs != null) : "No wire configuration map
specified";
this.targetName = targetName;
configurations = invocationConfigs;
}
- /**
- * Returns the qualified name of the target service specified by the wire
- */
public QualifiedName getTargetName() {
return targetName;
}
- /**
- * Returns the invocation configuration for each operation on a service
specified by a reference or a
- * target service.
- */
public Map<Method, TargetInvocationConfiguration>
getInvocationConfigurations() {
return configurations;
}
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/sandbox/jboynes/sca/core2/src/main/java/org/apache/tuscany/core/wire/WireTargetConfigurationImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified:
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java?rev=400166&r1=400165&r2=400166&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/core2/src/test/java/org/apache/tuscany/core/wire/jdk/JDKWireFactoryFactoryTestCase.java
Fri May 5 13:24:34 2006
@@ -26,10 +26,12 @@
import org.apache.tuscany.spi.QualifiedName;
import org.apache.tuscany.core.wire.InvokerInterceptor;
import org.apache.tuscany.core.wire.TargetInvocationConfigurationImpl;
-import org.apache.tuscany.spi.wire.WireSourceConfiguration;
-import org.apache.tuscany.spi.wire.WireTargetConfiguration;
+import org.apache.tuscany.core.wire.WireSourceConfigurationImpl;
+import org.apache.tuscany.core.wire.WireTargetConfigurationImpl;
import org.apache.tuscany.spi.wire.SourceInvocationConfiguration;
import org.apache.tuscany.spi.wire.TargetInvocationConfiguration;
+import org.apache.tuscany.spi.wire.WireSourceConfiguration;
+import org.apache.tuscany.spi.wire.WireTargetConfiguration;
public class JDKWireFactoryFactoryTestCase extends TestCase {
@@ -52,7 +54,7 @@
source.build();
Map<Method, SourceInvocationConfiguration> configs = new
MethodHashMap<SourceInvocationConfiguration>();
configs.put(hello, source);
- WireSourceConfiguration config = new WireSourceConfiguration("foo",
new QualifiedName("foo"), configs);
+ WireSourceConfiguration config = new
WireSourceConfigurationImpl("foo", new QualifiedName("foo"), configs);
JDKSourceWireFactory<SimpleTarget> factory = new
JDKSourceWireFactory<SimpleTarget>();
factory.setConfiguration(config);
factory.setBusinessInterface(SimpleTarget.class);
@@ -70,7 +72,7 @@
source.build();
Map<Method, TargetInvocationConfiguration> configs = new
MethodHashMap<TargetInvocationConfiguration>();
configs.put(hello, source);
- WireTargetConfiguration config = new WireTargetConfiguration(new
QualifiedName("foo"), configs);
+ WireTargetConfiguration config = new WireTargetConfigurationImpl(new
QualifiedName("foo"), configs);
JDKTargetWireFactory<SimpleTarget> factory = new
JDKTargetWireFactory<SimpleTarget>();
factory.setConfiguration(config);
factory.setBusinessInterface(SimpleTarget.class);
Modified:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java?rev=400166&r1=400165&r2=400166&view=diff
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
(original)
+++
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/InvocationConfiguration.java
Fri May 5 13:24:34 2006
@@ -11,7 +11,7 @@
* references to the target.
* <p/>
* <code>InvocationChain</code>s are managed by [EMAIL PROTECTED]
WireSourceConfiguration}s and [EMAIL PROTECTED]
- * WireTargetConfiguration}s, which are used by wire factories to
+ * WireTargetConfigurationImpl}s, which are used by wire factories to
* buildSource wires and proxies.
* <p/>
* Invocation configurations must contain at least one interceptor and may
have 0 to N handlers. Handlers
Added:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java?rev=400166&view=auto
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
(added)
+++
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireSourceConfiguration.java
Fri May 5 13:24:34 2006
@@ -0,0 +1,27 @@
+package org.apache.tuscany.spi.wire;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import org.apache.tuscany.spi.QualifiedName;
+
+/**
+ * @version $$Rev$$ $$Date$$
+ */
+public interface WireSourceConfiguration {
+ /**
+ * Returns the qualified name of the target service specified by the wire
+ */
+ QualifiedName getTargetName();
+
+ /**
+ * Returns the invocation configuration for each operation on a service
specified by a reference or a
+ * target service.
+ */
+ Map<Method, SourceInvocationConfiguration> getInvocationConfigurations();
+
+ /**
+ * Returns the name of the source reference
+ */
+ String getReferenceName();
+}
Added:
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java?rev=400166&view=auto
==============================================================================
---
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
(added)
+++
incubator/tuscany/sandbox/jboynes/sca/spi/src/main/java/org/apache/tuscany/spi/wire/WireTargetConfiguration.java
Fri May 5 13:24:34 2006
@@ -0,0 +1,22 @@
+package org.apache.tuscany.spi.wire;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+import org.apache.tuscany.spi.QualifiedName;
+
+/**
+ * @version $$Rev$$ $$Date$$
+ */
+public interface WireTargetConfiguration {
+ /**
+ * Returns the qualified name of the target service specified by the wire
+ */
+ QualifiedName getTargetName();
+
+ /**
+ * Returns the invocation configuration for each operation on a service
specified by a reference or a
+ * target service.
+ */
+ Map<Method, TargetInvocationConfiguration> getInvocationConfigurations();
+}
