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/08 02:31:12 UTC
svn commit: r526501 - in /incubator/tuscany/java/sca/modules:
core-spi/src/main/java/org/apache/tuscany/spi/
core-spi/src/main/java/org/apache/tuscany/spi/annotation/
core-spi/src/main/java/org/apache/tuscany/spi/component/
core-spi/src/main/java/org/a...
Author: rfeng
Date: Sat Apr 7 17:31:10 2007
New Revision: 526501
URL: http://svn.apache.org/viewvc?view=rev&rev=526501
Log:
Move LogLevel/Monitor/Resource to annotation package
Added:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/LogLevel.java
- copied, changed from r526397, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java
- copied, changed from r526397, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Resource.java
- copied, changed from r526397, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java
Removed:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java
Modified:
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java
incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
Copied: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/LogLevel.java (from r526397, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/LogLevel.java?view=diff&rev=526501&p1=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java&r1=526397&p2=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/LogLevel.java&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/LogLevel.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/LogLevel.java Sat Apr 7 17:31:10 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi;
+package org.apache.tuscany.spi.annotation;
import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
Copied: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java (from r526397, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java?view=diff&rev=526501&p1=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java&r1=526397&p2=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Monitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java Sat Apr 7 17:31:10 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi;
+package org.apache.tuscany.spi.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Copied: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Resource.java (from r526397, incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Resource.java?view=diff&rev=526501&p1=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java&r1=526397&p2=incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Resource.java&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/Resource.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/annotation/Resource.java Sat Apr 7 17:31:10 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi;
+package org.apache.tuscany.spi.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/InstanceWrapper.java Sat Apr 7 17:31:10 2007
@@ -18,8 +18,6 @@
*/
package org.apache.tuscany.spi.component;
-import org.apache.tuscany.spi.component.TargetDestructionException;
-import org.apache.tuscany.spi.component.TargetInitializationException;
/**
* Provides lifecycle management for an implementation instance associated with an {@link
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/component/ScopeContainerMonitor.java Sat Apr 7 17:31:10 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.component;
-import org.apache.tuscany.spi.LogLevel;
+import org.apache.tuscany.spi.annotation.LogLevel;
/**
* Defines monitor events for scope containers
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/deployer/DeploymentMonitor.java Sat Apr 7 17:31:10 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.spi.deployer;
-import org.apache.tuscany.spi.LogLevel;
import org.apache.tuscany.spi.TuscanyException;
+import org.apache.tuscany.spi.annotation.LogLevel;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/services/store/StoreMonitor.java Sat Apr 7 17:31:10 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.spi.services.store;
-import org.apache.tuscany.spi.LogLevel;
+import org.apache.tuscany.spi.annotation.LogLevel;
/**
* A generic monintor interface for services to log events
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/AbstractInvocationHandler.java Sat Apr 7 17:31:10 2007
@@ -22,7 +22,6 @@
import java.net.URI;
import java.util.LinkedList;
-import org.apache.tuscany.assembly.Contract;
import org.apache.tuscany.interfacedef.Interface;
import org.apache.tuscany.interfacedef.Operation;
import org.apache.tuscany.spi.component.WorkContext;
Modified: incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java (original)
+++ incubator/tuscany/java/sca/modules/core-spi/src/main/java/org/apache/tuscany/spi/wire/ProxyService.java Sat Apr 7 17:31:10 2007
@@ -43,9 +43,6 @@
*/
<T> T createProxy(Class<T> interfaze, Wire wire) throws ProxyCreationException;
- <T> T createProxy2(Class<T> interfaze, boolean conversational, Wire wire) throws ProxyCreationException;
-
-
/**
* Creates a Java proxy for the given wire
*
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeContainer.java Sat Apr 7 17:31:10 2007
@@ -22,8 +22,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.tuscany.spi.Monitor;
import org.apache.tuscany.spi.Scope;
+import org.apache.tuscany.spi.annotation.Monitor;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeContainer.java Sat Apr 7 17:31:10 2007
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.apache.tuscany.spi.Monitor;
import org.apache.tuscany.spi.Scope;
+import org.apache.tuscany.spi.annotation.Monitor;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.InstanceWrapper;
import org.apache.tuscany.spi.component.ScopeContainer;
Modified: incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/core/monitor/ProxyMonitorFactory.java Sat Apr 7 17:31:10 2007
@@ -38,7 +38,7 @@
import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.host.monitor.ExceptionFormatter;
import org.apache.tuscany.host.monitor.FormatterRegistry;
-import org.apache.tuscany.spi.LogLevel;
+import org.apache.tuscany.spi.annotation.LogLevel;
/**
* @version $Rev$ $Date$
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java Sat Apr 7 17:31:10 2007
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
import org.apache.tuscany.host.MonitorFactory;
-import org.apache.tuscany.spi.LogLevel;
+import org.apache.tuscany.spi.annotation.LogLevel;
/**
* Test case for the JavaLoggingMonitorFactory.
Modified: incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java?view=diff&rev=526501&r1=526500&r2=526501
==============================================================================
--- incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java (original)
+++ incubator/tuscany/java/sca/modules/core/src/test/java/org/apache/tuscany/core/services/store/memory/MemoryStore.java Sat Apr 7 17:31:10 2007
@@ -24,7 +24,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.tuscany.spi.Monitor;
+import org.apache.tuscany.spi.annotation.Monitor;
import org.apache.tuscany.spi.component.SCAObject;
import org.apache.tuscany.spi.event.AbstractEventPublisher;
import org.apache.tuscany.spi.services.store.DuplicateRecordException;
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org