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:05:35 UTC
svn commit: r510408 - in /incubator/tuscany/java/sca/kernel:
api/src/main/java/org/apache/tuscany/api/annotation/
core/src/main/java/org/apache/tuscany/core/implementation/processor/
core/src/main/java/org/apache/tuscany/core/injection/ core/src/test/j...
Author: jmarino
Date: Wed Feb 21 22:05:34 2007
New Revision: 510408
URL: http://svn.apache.org/viewvc?view=rev&rev=510408
Log:
move @Resource
Added:
incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java (contents, props changed)
- copied, changed from r510380, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Resource.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.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/injection/ResourceObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
Copied: incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java (from r510380, incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/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=510408&p1=incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Resource.java&r1=510380&p2=incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java&r2=510408
==============================================================================
--- incubator/tuscany/java/spec/sca-api-r1.0/src/main/java/org/osoa/sca/annotations/Resource.java (original)
+++ incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java Wed Feb 21 22:05:34 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.osoa.sca.annotations;
+package org.apache.tuscany.api.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Propchange: incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java?view=diff&rev=510408&r1=510407&r2=510408
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ImplementationProcessorServiceImpl.java Wed Feb 21 22:05:34 2007
@@ -31,7 +31,7 @@
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Resource;
+import org.apache.tuscany.api.annotation.Resource;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.databinding.extension.SimpleTypeMapperExtension;
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java?view=diff&rev=510408&r1=510407&r2=510408
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java Wed Feb 21 22:05:34 2007
@@ -21,7 +21,7 @@
import org.apache.tuscany.spi.implementation.java.ProcessingException;
/**
- * Denotes an invalid usage of {@link @org.osoa.sca.annotations.Resource}
+ * Denotes an invalid usage of {@link @org.apache.tuscany.api.annotation.Resource}
*
* @version $Rev$ $Date$
*/
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=510408&r1=510407&r2=510408
==============================================================================
--- 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:05:34 2007
@@ -50,7 +50,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context)
throws ProcessingException {
- org.osoa.sca.annotations.Resource annotation = method.getAnnotation(org.osoa.sca.annotations.Resource.class);
+ org.apache.tuscany.api.annotation.Resource annotation = method.getAnnotation(org.apache.tuscany.api.annotation.Resource.class);
if (annotation == null) {
return;
}
@@ -81,7 +81,7 @@
PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
DeploymentContext context) throws ProcessingException {
- org.osoa.sca.annotations.Resource annotation = field.getAnnotation(org.osoa.sca.annotations.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/injection/ResourceObjectFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java?view=diff&rev=510408&r1=510407&r2=510408
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/injection/ResourceObjectFactory.java Wed Feb 21 22:05:34 2007
@@ -25,7 +25,7 @@
/**
* Resolves a runtime resource to be injected on a field or method of a Java component type marked with {@link
- * org.osoa.sca.annotations.Resource}. If the mapped name of the resource is an absolute URI such as
+ * org.apache.tuscany.api.annotation.Resource}. If the mapped name of the resource is an absolute URI such as
* <code>sca://localhost</code> or <code>jndi://localhost</code> the host container namespace is searched; otherwise the
* URI is assumed to be relative and the parent composite is searched. If a mapped name is not provided, i.e. resolution
* is by type, the parent composite is first searched followed by the host namespace.
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java?view=diff&rev=510408&r1=510407&r2=510408
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java Wed Feb 21 22:05:34 2007
@@ -21,7 +21,7 @@
import java.lang.reflect.Constructor;
import java.util.List;
-import org.osoa.sca.annotations.Resource;
+import org.apache.tuscany.api.annotation.Resource;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java?view=diff&rev=510408&r1=510407&r2=510408
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java Wed Feb 21 22:05:34 2007
@@ -73,21 +73,21 @@
private class Foo {
- @org.osoa.sca.annotations.Resource
+ @org.apache.tuscany.api.annotation.Resource
protected Bar bar;
- @org.osoa.sca.annotations.Resource(optional = true)
+ @org.apache.tuscany.api.annotation.Resource(optional = true)
protected Bar barNotRequired;
- @org.osoa.sca.annotations.Resource
+ @org.apache.tuscany.api.annotation.Resource
public void setBar(Bar bar) {
}
- @org.osoa.sca.annotations.Resource(name = "someName", mappedName = "mapped")
+ @org.apache.tuscany.api.annotation.Resource(name = "someName", mappedName = "mapped")
public void setBar2(Bar bar) {
}
- @org.osoa.sca.annotations.Resource
+ @org.apache.tuscany.api.annotation.Resource
public void setBad() {
}
Modified: incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java?view=diff&rev=510408&r1=510407&r2=510408
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/integration/implementation/IntrospectionRegistryIntegrationTestCase.java Wed Feb 21 22:05:34 2007
@@ -23,7 +23,7 @@
import org.osoa.sca.annotations.Property;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Resource;
+import org.apache.tuscany.api.annotation.Resource;
import org.apache.tuscany.spi.implementation.java.ImplementationProcessorService;
import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org