Author: jmarino
Date: Fri Mar 31 06:30:58 2006
New Revision: 390432
URL: http://svn.apache.org/viewcvs?rev=390432&view=rev
Log:
forgot these jdk 5 changes that broke previous build
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java?rev=390432&r1=390431&r2=390432&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/ExternalServiceContextImpl.java
Fri Mar 31 06:30:58 2006
@@ -27,15 +27,15 @@
*
* @version $Rev$ $Date$
*/
-public class ExternalServiceContextImpl<T> extends AbstractContext implements
ExternalServiceContext<T> {
+public class ExternalServiceContextImpl extends AbstractContext implements
ExternalServiceContext {
private ProxyFactory<?> targetProxyFactory;
- private ObjectFactory<T> targetInstanceFactory;
+ private ObjectFactory targetInstanceFactory;
/**
* Creates an external service context
- *
+ *
* @param name the name of the external service
* @param targetProxyFactory the factory which creates proxies
implementing the configured service interface for the
* external service. There is always only one proxy factory as an
external service is configured with one
@@ -43,7 +43,7 @@
* @param targetInstanceFactory the object factory that creates an
artifact capabile of communicating over the
* binding transport configured on the external service. The object
factory may implement a caching strategy.
*/
- public ExternalServiceContextImpl(String name, ProxyFactory
targetProxyFactory, ObjectFactory<T> targetInstanceFactory) {
+ public ExternalServiceContextImpl(String name, ProxyFactory
targetProxyFactory, ObjectFactory targetInstanceFactory) {
super(name);
assert (targetProxyFactory != null) : "Target proxy factory was null";
assert (targetInstanceFactory != null) : "Target instance factory was
null";
@@ -75,11 +75,11 @@
return getInstance(qName);
}
- public T getImplementationInstance() throws TargetException {
+ public Object getImplementationInstance() throws TargetException {
return targetInstanceFactory.getInstance();
}
- public T getImplementationInstance(boolean notify) throws TargetException {
+ public Object getImplementationInstance(boolean notify) throws
TargetException {
return getImplementationInstance();
}
}
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java?rev=390432&r1=390431&r2=390432&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/DefaultScopeStrategy.java
Fri Mar 31 06:30:58 2006
@@ -40,7 +40,7 @@
ScopeContext requestScope = new RequestScopeContext(eventContext);
ScopeContext statelessScope = new StatelessScopeContext(eventContext);
ScopeContext aggregrateScope = new AggregateScopeContext(eventContext);
- Map<Scope,ScopeContext> scopes = new HashMap();
+ Map<Scope,ScopeContext> scopes = new HashMap<Scope,ScopeContext>();
scopes.put(Scope.MODULE,moduleScope);
scopes.put(Scope.SESSION,sessionScope);
scopes.put(Scope.REQUEST,requestScope);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java?rev=390432&r1=390431&r2=390432&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/scope/RequestScopeContext.java
Fri Mar 31 06:30:58 2006
@@ -29,7 +29,7 @@
*
* @version $Rev$ $Date$
*/
-public class RequestScopeContext extends
AbstractScopeContext<RequestScopeContext> implements RuntimeEventListener,
LifecycleEventListener {
+public class RequestScopeContext extends AbstractScopeContext implements
RuntimeEventListener, LifecycleEventListener {
// ----------------------------------
// Fields
@@ -173,14 +173,6 @@
} else {
return null;
}
- }
-
- public RequestScopeContext getImplementationInstance() throws
TargetException {
- return this;
- }
-
- public RequestScopeContext getImplementationInstance(boolean notify)
throws TargetException{
- return this;
}
private void destroyContext() {
