You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/06 19:30:47 UTC
svn commit: r526232 [1/5] - in /incubator/tuscany/java/sca/modules: ./
idl/src/main/java/org/apache/tuscany/idl/util/
impl-java-xml/src/main/java/org/apache/tuscany/api/
impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/
impl-java-xml/src/m...
Author: rfeng
Date: Fri Apr 6 10:30:44 2007
New Revision: 526232
URL: http://svn.apache.org/viewvc?view=rev&rev=526232
Log:
Port java introspection/annotation processers over the assembly/java model
Added:
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AbstractPropertyProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AllowsPassByReferenceProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AmbiguousConstructorException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConstructorProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConversationProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DestroyProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateConstructorException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateConstructorException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateDestructorException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateDestructorException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateInitException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateInitException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateReferenceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateReferenceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateResourceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateResourceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/EagerInitProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/HeuristicPojoProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalCallbackReferenceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalCallbackReferenceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalContextException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalContextException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalDestructorException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalDestructorException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalInitException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalInitException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalReferenceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalReferenceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalResourceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalResourceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/IllegalServiceDefinitionException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/IllegalServiceDefinitionException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InitProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InitProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InvalidConstructorException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidConstructorException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InvalidConversationalImplementation.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidConversationalImplementation.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InvalidPropertyException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidPropertyException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InvalidReferenceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidReferenceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InvalidResourceException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidResourceException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/InvalidServiceType.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/InvalidServiceType.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/JavaIntrospectionHelper.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/NoConstructorException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/NoConstructorException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/PropertyProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/PropertyProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ReferenceProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ResourceProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ResourceProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ScopeProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ScopeProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ServiceProcessor.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceProcessor.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ServiceTypeNotFoundException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ServiceTypeNotFoundException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/UnknownContextTypeException.java
- copied, changed from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/UnknownContextTypeException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/AbstractProcessorTest.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorPropertyTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorReferenceTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ConstructorResourceTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ContextProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ConversationProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ConvertTimeMillisTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/DestroyProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicAndPropertyTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicConstructorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/HeuristicPojoProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/HeutisticExtensibleConstructorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/InitProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ModelHelper.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/PropertyProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ReferenceProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ResourceProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ScopeProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceCallbackTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java-xml/src/test/java/org/apache/tuscany/core/implementation/processor/ServiceProcessorTestCase.java (with props)
incubator/tuscany/java/sca/modules/impl-java/src/main/java/org/apache/tuscany/implementation/java/impl/Scope.java (with props)
Modified:
incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/JavaXMLMapper.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/IllegalPropertyException.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ImplementationProcessorExtension.java
incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ProcessingException.java
incubator/tuscany/java/sca/modules/impl-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaElement.java
incubator/tuscany/java/sca/modules/impl-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaImplementationDefinition.java
incubator/tuscany/java/sca/modules/impl-java/src/main/java/org/apache/tuscany/implementation/java/impl/JavaImplementationImpl.java
incubator/tuscany/java/sca/modules/pom.xml
Modified: incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/JavaXMLMapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/JavaXMLMapper.java?view=diff&rev=526232&r1=526231&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/JavaXMLMapper.java (original)
+++ incubator/tuscany/java/sca/modules/idl/src/main/java/org/apache/tuscany/idl/util/JavaXMLMapper.java Fri Apr 6 10:30:44 2007
@@ -25,10 +25,8 @@
import javax.xml.namespace.QName;
public final class JavaXMLMapper {
+ public static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
private static final Map<Class, QName> JAVA2XML = new HashMap<Class, QName>();
-
- private static final String URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
-
private static final Map<String, Class> XML2JAVA = new HashMap<String, Class>();
private JavaXMLMapper() {
Added: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java?view=auto&rev=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java (added)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java Fri Apr 6 10:30:44 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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.api.annotation;
+
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation that can be applied to methods in a monitoring interface to indicate to logging frameworks the severity of
+ * the event.
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({METHOD})
+@Retention(RUNTIME)
+public @interface LogLevel {
+
+ /**
+ * The log level as specified by {@link java.util.logging.Level}.
+ */
+ @SuppressWarnings({"JavaDoc"}) String value();
+}
Propchange: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java?view=auto&rev=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java (added)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java Fri Apr 6 10:30:44 2007
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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.api.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A system annotation to inject a monitor
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Monitor {
+}
Propchange: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java?view=auto&rev=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java (added)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java Fri Apr 6 10:30:44 2007
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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.api.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation used to indicate a resource should be provided to an implementation by the runtime.
+ *
+ * @version $Rev$ $Date$
+ */
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Resource {
+
+ /**
+ * Denotes the name of the resource declared by the implementation.
+ */
+ String name() default "";
+
+ /**
+ * Denotes if the resource is optional
+ */
+ boolean optional() default false;
+
+ /**
+ * Denotes the default name of the resource provided by the runtime environment.
+ */
+ String mappedName() default "";
+}
Propchange: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/api/annotation/Resource.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/IllegalPropertyException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/IllegalPropertyException.java?view=diff&rev=526232&r1=526231&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/IllegalPropertyException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/IllegalPropertyException.java Fri Apr 6 10:30:44 2007
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.implementation.java.introspection;
+import java.lang.reflect.Member;
+
/**
* Denotes an illegal property definition in a component type
*
@@ -29,4 +31,8 @@
public IllegalPropertyException(String message) {
super(message);
}
+
+ public IllegalPropertyException(String message, Member member) {
+ super(message, member);
+ }
}
Modified: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ImplementationProcessorExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ImplementationProcessorExtension.java?view=diff&rev=526232&r1=526231&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ImplementationProcessorExtension.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ImplementationProcessorExtension.java Fri Apr 6 10:30:44 2007
@@ -22,6 +22,8 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import org.apache.tuscany.assembly.AssemblyFactory;
+import org.apache.tuscany.assembly.impl.DefaultAssemblyFactory;
import org.apache.tuscany.idl.java.introspection.JavaInterfaceProcessorRegistry;
import org.apache.tuscany.implementation.java.impl.Parameter;
import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
@@ -38,15 +40,22 @@
*/
@EagerInit
public abstract class ImplementationProcessorExtension implements ImplementationProcessor {
+ protected AssemblyFactory factory;
protected IntrospectionRegistry registry;
protected JavaInterfaceProcessorRegistry interfaceProcessorRegistry;
+ public ImplementationProcessorExtension() {
+ super();
+ this.factory = new DefaultAssemblyFactory();
+ }
+
/**
* @param registry
*/
public ImplementationProcessorExtension(IntrospectionRegistry registry) {
super();
this.registry = registry;
+ this.factory = new DefaultAssemblyFactory();
}
@Reference
Modified: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ProcessingException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ProcessingException.java?view=diff&rev=526232&r1=526231&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ProcessingException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/introspection/ProcessingException.java Fri Apr 6 10:30:44 2007
@@ -22,7 +22,7 @@
/**
* Denotes a problem processing annotations on a POJO implementation
- *
+ *
* @version $Rev$ $Date$
*/
public class ProcessingException extends Exception {
@@ -36,6 +36,11 @@
super(message);
}
+ public ProcessingException(String message, Member member) {
+ super(message);
+ this.member = member;
+ }
+
public ProcessingException(String message, Throwable cause) {
super(message, cause);
}
@@ -43,7 +48,6 @@
public ProcessingException(Throwable cause) {
super(cause);
}
-
public Member getMember() {
return member;
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AbstractPropertyProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AbstractPropertyProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AbstractPropertyProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AbstractPropertyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AbstractPropertyProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,28 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
-import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Map;
-import org.apache.tuscany.api.annotation.DataType;
-import org.apache.tuscany.core.util.JavaIntrospectionHelper;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.DuplicatePropertyException;
-import org.apache.tuscany.spi.implementation.java.IllegalPropertyException;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaElement;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.Parameter;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.assembly.Property;
+import org.apache.tuscany.idl.util.JavaXMLMapper;
+import org.apache.tuscany.implementation.java.impl.JavaElement;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.impl.Parameter;
+import org.apache.tuscany.implementation.java.introspection.DuplicatePropertyException;
+import org.apache.tuscany.implementation.java.introspection.IllegalPropertyException;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Base class for ImplementationProcessors that handle annotations that add
@@ -52,20 +47,18 @@
this.annotationClass = annotationClass;
}
- public void visitMethod(Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
A annotation = method.getAnnotation(annotationClass);
if (annotation == null) {
return;
}
if (!Void.TYPE.equals(method.getReturnType())) {
- throw new IllegalPropertyException("Method does not have void return type", method.toString());
+ throw new IllegalPropertyException("Method does not have void return type", method);
}
Class[] paramTypes = method.getParameterTypes();
if (paramTypes.length != 1) {
- throw new IllegalPropertyException("Method must have a single parameter", method.toString());
+ throw new IllegalPropertyException("Method must have a single parameter", method);
}
String name = getName(annotation);
@@ -76,26 +69,22 @@
}
}
- Map<String, JavaMappedProperty<?>> properties = type.getProperties();
+ Map<String, JavaElement> properties = type.getPropertyMembers();
if (properties.containsKey(name)) {
throw new DuplicatePropertyException(name);
}
JavaElement element = new JavaElement(method, 0);
- JavaMappedProperty<?> property = createProperty(name, element);
+ Property property = createProperty(name, element);
// add databinding available as annotations, as extensions
- DataType propertyDataBinding = method.getAnnotation(DataType.class);
- if (propertyDataBinding != null) {
- property.getExtensions().put("databinding", propertyDataBinding.name());
- }
- initProperty(property, annotation, context);
- properties.put(name, property);
+
+ initProperty(property, annotation);
+ type.getProperties().add(property);
+ properties.put(name, element);
}
- public void visitField(Field field,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
A annotation = field.getAnnotation(annotationClass);
if (annotation == null) {
@@ -110,30 +99,22 @@
name = field.getName();
}
- Map<String, JavaMappedProperty<?>> properties = type.getProperties();
+ Map<String, JavaElement> properties = type.getPropertyMembers();
if (properties.containsKey(name)) {
throw new DuplicatePropertyException(name);
}
JavaElement element = new JavaElement(field);
- JavaMappedProperty<?> property = createProperty(name, element);
-
- // add databinding available as annotations, as extensions
- DataType propertyDataBinding = field.getAnnotation(DataType.class);
- if (propertyDataBinding != null) {
- property.getExtensions().put("databinding", propertyDataBinding.name());
- }
-
- initProperty(property, annotation, context);
- properties.put(name, property);
+ Property property = createProperty(name, element);
+ initProperty(property, annotation);
+ type.getProperties().add(property);
+ properties.put(name, element);
}
- public void visitConstructorParameter(Parameter parameter,
- PojoComponentType<JavaMappedService,
- JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public void visitConstructorParameter(Parameter parameter, JavaImplementationDefinition type)
+ throws ProcessingException {
- Map<String, JavaMappedProperty<?>> properties = type.getProperties();
+ Map<String, JavaElement> properties = type.getPropertyMembers();
A annotation = parameter.getAnnotation(annotationClass);
if (annotation != null) {
String name = getName(annotation);
@@ -155,24 +136,25 @@
}
parameter.setName(name);
parameter.setClassifer(annotationClass);
- JavaMappedProperty<?> property = createProperty(name, parameter);
- initProperty(property, annotation, context);
- properties.put(name, property);
+ Property property = createProperty(name, parameter);
+ initProperty(property, annotation);
+ type.getProperties().add(property);
+ properties.put(name, parameter);
}
}
protected abstract String getName(A annotation);
- protected <T> void initProperty(JavaMappedProperty<T> property, A annotation, DeploymentContext context)
- throws ProcessingException {
- }
+ protected abstract void initProperty(Property property, A annotation) throws ProcessingException;
@SuppressWarnings("unchecked")
- protected <T> JavaMappedProperty<T> createProperty(String name, JavaElement element) throws ProcessingException {
+ protected Property createProperty(String name, JavaElement element) throws ProcessingException {
+
+ Property property = factory.createProperty();
+ property.setName(name);
+ Class<?> baseType = JavaIntrospectionHelper.getBaseType(element.getType(), element.getGenericType());
+ property.setXSDType(JavaXMLMapper.getXMLType(baseType));
- Class<?> baseType = getBaseType(element.getType(), element.getGenericType());
- JavaMappedProperty<T> property = new JavaMappedProperty<T>(name, null, (Class<T>)baseType, (Member)element
- .getAnchor());
Class<?> javaType = element.getType();
if (javaType.isArray() || Collection.class.isAssignableFrom(javaType)) {
property.setMany(true);
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AllowsPassByReferenceProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AllowsPassByReferenceProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AllowsPassByReferenceProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/AllowsPassByReferenceProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AllowsPassByReferenceProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,20 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
import java.lang.reflect.Method;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
import org.osoa.sca.annotations.AllowsPassByReference;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
-
/**
* Processes {@link AllowsPassByReference} on an implementation
*
@@ -37,16 +32,12 @@
*/
public class AllowsPassByReferenceProcessor extends ImplementationProcessorExtension {
- public <T> void visitClass(Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
type.setAllowsPassByReference(clazz.isAnnotationPresent(AllowsPassByReference.class));
}
@Override
- public void visitMethod(Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
boolean pbr = method.isAnnotationPresent(AllowsPassByReference.class);
if (pbr) {
type.getAllowsPassByReferenceMethods().add(method);
Added: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AmbiguousConstructorException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AmbiguousConstructorException.java?view=auto&rev=526232
==============================================================================
--- incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AmbiguousConstructorException.java (added)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/AmbiguousConstructorException.java Fri Apr 6 10:30:44 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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.implementation.java.processor;
+
+import java.lang.reflect.Member;
+
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
+
+/**
+ * Thrown when constructor parameters cannot be unambiguously resolved to a property or reference
+ *
+ * @version $Rev$ $Date$
+ */
+public class AmbiguousConstructorException extends ProcessingException {
+ private static final long serialVersionUID = 3662860753837091880L;
+
+ public AmbiguousConstructorException(String message) {
+ super(message);
+ }
+
+ public AmbiguousConstructorException(String message, Member member) {
+ super(message, member);
+ }
+}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConstructorProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConstructorProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConstructorProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConstructorProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConstructorProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,19 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
import java.lang.reflect.Constructor;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ConstructorDefinition;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.Parameter;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.implementation.java.impl.ConstructorDefinition;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.impl.Parameter;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Handles processing of a constructor decorated with
@@ -42,9 +38,7 @@
public ConstructorProcessor() {
}
- public <T> void visitClass(Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
Constructor[] ctors = clazz.getConstructors();
boolean found = false;
for (Constructor constructor : ctors) {
@@ -52,8 +46,7 @@
type.getConstructors().put(constructor, definition);
if (constructor.getAnnotation(org.osoa.sca.annotations.Constructor.class) != null) {
if (found) {
- String name = constructor.getDeclaringClass().getName();
- throw new DuplicateConstructorException("Multiple constructors marked with @Constructor", name);
+ throw new DuplicateConstructorException("Multiple constructors marked with @Constructor", constructor);
}
found = true;
type.setConstructorDefinition(definition);
@@ -61,10 +54,8 @@
}
}
- public <T> void visitConstructor(Constructor<T> constructor,
- PojoComponentType<JavaMappedService, JavaMappedReference,
- JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public <T> void visitConstructor(Constructor<T> constructor, JavaImplementationDefinition type)
+ throws ProcessingException {
org.osoa.sca.annotations.Constructor annotation = constructor
.getAnnotation(org.osoa.sca.annotations.Constructor.class);
if (annotation == null) {
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ContextProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ContextProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,53 +16,34 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.impl.Resource;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
-import org.apache.tuscany.spi.implementation.java.Resource;
-
-import org.apache.tuscany.core.injection.RequestContextObjectFactory;
-import org.apache.tuscany.core.util.JavaIntrospectionHelper;
/**
- * Processes {@link @Context} annotations on a component implementation and adds a {@link JavaMappedProperty} to the
- * component type which will be used to inject the appropriate context
- *
+ * Processes {@link @Context} annotations on a component implementation and adds
+ * a {@link JavaMappedProperty} to the component type which will be used to
+ * inject the appropriate context
+ *
* @version $Rev$ $Date$
*/
public class ContextProcessor extends ImplementationProcessorExtension {
- private WorkContext workContext;
-
- @Reference
- public void setWorkContext(WorkContext workContext) {
- this.workContext = workContext;
- }
- public void visitMethod(
- Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context)
- throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
if (method.getAnnotation(Context.class) == null) {
return;
}
if (method.getParameterTypes().length != 1) {
- throw new IllegalContextException("Context setter must have one parameter", method.toString());
+ throw new IllegalContextException("Context setter must have one parameter", method);
}
Class<?> paramType = method.getParameterTypes()[0];
if (ComponentContext.class.equals(paramType)) {
@@ -72,16 +53,15 @@
} else if (RequestContext.class.equals(paramType)) {
String name = JavaIntrospectionHelper.toPropertyName(method.getName());
Resource<RequestContext> resource = new Resource<RequestContext>(name, RequestContext.class, method);
- resource.setObjectFactory(new RequestContextObjectFactory(workContext));
+ // FIXME: Move the association with ObjectFactory to a later stage
+ // resource.setObjectFactory(new RequestContextObjectFactory(workContext));
type.getResources().put(name, resource);
} else {
throw new UnknownContextTypeException(paramType.getName());
}
}
- public void visitField(Field field,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public void visitField(Field field, JavaImplementationDefinition type) throws ProcessingException {
if (field.getAnnotation(Context.class) == null) {
return;
}
@@ -94,7 +74,9 @@
String name = field.getName();
name = JavaIntrospectionHelper.toPropertyName(name);
Resource<RequestContext> resource = new Resource<RequestContext>(name, RequestContext.class, field);
- resource.setObjectFactory(new RequestContextObjectFactory(workContext));
+
+ // FIXME: Move the association with ObjectFactory to a later stage
+ // resource.setObjectFactory(new RequestContextObjectFactory(workContext));
type.getResources().put(name, resource);
} else {
throw new UnknownContextTypeException(paramType.getName());
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConversationProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConversationProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConversationProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/ConversationProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/ConversationProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,23 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
import org.osoa.sca.annotations.ConversationAttributes;
import org.osoa.sca.annotations.ConversationID;
import org.osoa.sca.annotations.Scope;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
-
/**
* @version $Rev$ $Date$
*/
@@ -43,9 +38,7 @@
private static final String DAYS = " DAYS";
private static final String YEARS = " YEARS";
- public <T> void visitClass(Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ public <T> void visitClass(Class<T> clazz, JavaImplementationDefinition type) throws ProcessingException {
ConversationAttributes conversation = clazz.getAnnotation(ConversationAttributes.class);
if (conversation == null) {
@@ -54,18 +47,18 @@
Scope scope = clazz.getAnnotation(Scope.class);
if (scope == null) {
// implicitly assume conversation
- type.setImplementationScope(org.apache.tuscany.spi.model.Scope.CONVERSATION);
+ type.setScope(org.apache.tuscany.implementation.java.impl.Scope.CONVERSATION);
} else if (scope != null && !"CONVERSATION".equals(scope.value().toUpperCase())) {
throw new InvalidConversationalImplementation(
- "Service is marked with @ConversationAttributes but the scope is not @Scope(\"CONVERSATION\")",
- clazz.getName());
+ "Service is marked with @ConversationAttributes but the scope is not @Scope(\"CONVERSATION\")"
+ );
} else if (conversation != null) {
long maxAge;
long maxIdleTime;
String maxAgeVal = conversation.maxAge();
String maxIdleTimeVal = conversation.maxIdleTime();
if (maxAgeVal.length() > 0 && maxIdleTimeVal.length() > 0) {
- throw new InvalidConversationalImplementation("Max idle time and age both specified", clazz.getName());
+ throw new InvalidConversationalImplementation("Max idle time and age both specified");
}
try {
if (maxAgeVal.length() > 0) {
@@ -73,7 +66,7 @@
type.setMaxAge(maxAge);
}
} catch (NumberFormatException e) {
- throw new InvalidConversationalImplementation("Invalid maximum age", clazz.getName(), e);
+ throw new InvalidConversationalImplementation("Invalid maximum age", e);
}
try {
if (maxIdleTimeVal.length() > 0) {
@@ -81,16 +74,14 @@
type.setMaxIdleTime(maxIdleTime);
}
} catch (NumberFormatException e) {
- throw new InvalidConversationalImplementation("Invalid maximum idle time", clazz.getName(), e);
+ throw new InvalidConversationalImplementation("Invalid maximum idle time", e);
}
}
}
public void visitMethod(Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context)
- throws ProcessingException {
+ JavaImplementationDefinition type) throws ProcessingException {
ConversationID conversationID = method.getAnnotation(ConversationID.class);
if (conversationID == null) {
return;
@@ -99,8 +90,7 @@
}
public void visitField(Field field,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
+ JavaImplementationDefinition type) throws ProcessingException {
ConversationID conversationID = field.getAnnotation(ConversationID.class);
if (conversationID == null) {
return;
@@ -136,6 +126,7 @@
String units = expr.substring(0, i);
return Long.parseLong(units) * 31556926000L;
}
- return Long.parseLong(expr) * 1000; // assume seconds if no suffix specified
+ return Long.parseLong(expr) * 1000; // assume seconds if no suffix
+ // specified
}
}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DestroyProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DestroyProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DestroyProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DestroyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DestroyProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,39 +16,31 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
import org.osoa.sca.annotations.Destroy;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
-
/**
- * Processes the {@link @Destroy} annotation on a component implementation and updates the component type with the
- * decorated destructor method
- *
+ * Processes the {@link @Destroy} annotation on a component implementation and
+ * updates the component type with the decorated destructor method
+ *
* @version $Rev$ $Date$
*/
public class DestroyProcessor extends ImplementationProcessorExtension {
- public void visitMethod(Method method,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context)
- throws ProcessingException {
+ public void visitMethod(Method method, JavaImplementationDefinition type) throws ProcessingException {
Destroy annotation = method.getAnnotation(Destroy.class);
if (annotation == null) {
return;
}
if (method.getParameterTypes().length != 0) {
- throw new IllegalDestructorException("Destructor must not have argments", method.toString());
+ throw new IllegalDestructorException("Destructor must not have argments", method);
}
if (type.getDestroyMethod() != null) {
throw new DuplicateDestructorException("More than one destructor found on implementation");
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateConstructorException.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateConstructorException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateConstructorException.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateConstructorException.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateConstructorException.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateConstructorException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateConstructorException.java Fri Apr 6 10:30:44 2007
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import java.lang.reflect.Member;
+
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Thrown when more than one component implementation constructor is annotated with {@link
@@ -33,7 +35,7 @@
super(message);
}
- public DuplicateConstructorException(String message, String identifier) {
- super(message, identifier);
+ public DuplicateConstructorException(String message, Member member) {
+ super(message, member);
}
}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateDestructorException.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateDestructorException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateDestructorException.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateDestructorException.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateDestructorException.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateDestructorException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateDestructorException.java Fri Apr 6 10:30:44 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Thrown when an implementation is annotated multiple times with {@link org.osoa.sca.annotations.Destroy}
@@ -32,7 +32,4 @@
super(message);
}
- public DuplicateDestructorException(String message, String identifier) {
- super(message, identifier);
- }
}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateInitException.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateInitException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateInitException.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateInitException.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateInitException.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateInitException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateInitException.java Fri Apr 6 10:30:44 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Thrown when an implementation is annotated multiple times with {@link @org.osoa.sca.annotations.Init}
@@ -32,7 +32,4 @@
super(message);
}
- public DuplicateInitException(String message, String identifier) {
- super(message, identifier);
- }
}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateReferenceException.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateReferenceException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateReferenceException.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateReferenceException.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateReferenceException.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateReferenceException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateReferenceException.java Fri Apr 6 10:30:44 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Thrown when an implementation has more than one reference injection site with the same name
@@ -32,8 +32,4 @@
super(message);
}
-
- public DuplicateReferenceException(String message, String identifier) {
- super(message, identifier);
- }
}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateResourceException.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateResourceException.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateResourceException.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateResourceException.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateResourceException.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/DuplicateResourceException.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/DuplicateResourceException.java Fri Apr 6 10:30:44 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
/**
* Thrown when an implementation has more than one resource injection site with the same name
@@ -33,7 +33,4 @@
super(message);
}
- public DuplicateResourceException(String message, String identifier) {
- super(message, identifier);
- }
}
Copied: incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/EagerInitProcessor.java (from r525324, incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/EagerInitProcessor.java?view=diff&rev=526232&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java&r1=525324&p2=incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/EagerInitProcessor.java&r2=526232
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/processor/EagerInitProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/impl-java-xml/src/main/java/org/apache/tuscany/implementation/java/processor/EagerInitProcessor.java Fri Apr 6 10:30:44 2007
@@ -16,18 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.implementation.processor;
+package org.apache.tuscany.implementation.java.processor;
+import org.apache.tuscany.implementation.java.impl.JavaImplementationDefinition;
+import org.apache.tuscany.implementation.java.introspection.ImplementationProcessorExtension;
+import org.apache.tuscany.implementation.java.introspection.ProcessingException;
import org.osoa.sca.annotations.EagerInit;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.implementation.java.ImplementationProcessorExtension;
-import org.apache.tuscany.spi.implementation.java.JavaMappedProperty;
-import org.apache.tuscany.spi.implementation.java.JavaMappedReference;
-import org.apache.tuscany.spi.implementation.java.JavaMappedService;
-import org.apache.tuscany.spi.implementation.java.PojoComponentType;
-import org.apache.tuscany.spi.implementation.java.ProcessingException;
-
/**
* Handles processing of {@link org.osoa.sca.annotations.EagerInit}
*
@@ -36,9 +31,8 @@
public class EagerInitProcessor extends ImplementationProcessorExtension {
public <T> void visitClass(Class<T> clazz,
- PojoComponentType<JavaMappedService, JavaMappedReference, JavaMappedProperty<?>> type,
- DeploymentContext context) throws ProcessingException {
- super.visitClass(clazz, type, context);
+ JavaImplementationDefinition type) throws ProcessingException {
+ super.visitClass(clazz, type);
EagerInit annotation = clazz.getAnnotation(EagerInit.class);
if (annotation == null) {
Class<?> superClass = clazz.getSuperclass();
@@ -53,6 +47,6 @@
return;
}
}
- type.setInitLevel(50);
+ type.setEagerInit(true);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org