You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2006/08/17 07:10:14 UTC
svn commit: r432142 - in /incubator/tuscany/java/sca:
api/src/main/java/org/apache/tuscany/api/annotation/
core/src/main/java/org/apache/tuscany/core/bootstrap/
core/src/main/java/org/apache/tuscany/core/implementation/
core/src/main/java/org/apache/tu...
Author: jboynes
Date: Wed Aug 16 22:10:13 2006
New Revision: 432142
URL: http://svn.apache.org/viewvc?rev=432142&view=rev
Log:
moved Monitor annotations to api and factory to host-api so they can be shared between host and runtime
Added:
incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/
incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java (contents, props changed)
- copied, changed from r432136, incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java
incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java (contents, props changed)
- copied, changed from r432136, incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java
incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java (with props)
incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java (with props)
Removed:
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/IntrospectionRegistryImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java
incubator/tuscany/java/sca/host-api/pom.xml
incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java
incubator/tuscany/java/sca/spi/pom.xml
Copied: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java (from r432136, incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java?p2=incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java&p1=incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java&r1=432136&r2=432142&rev=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/monitor/LogLevel.java (original)
+++ incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java Wed Aug 16 22:10:13 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi.monitor;
+package org.apache.tuscany.api.annotation;
import static java.lang.annotation.ElementType.METHOD;
import java.lang.annotation.Retention;
Propchange: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java (from r432136, incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java?p2=incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java&p1=incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java&r1=432136&r2=432142&rev=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/annotation/Monitor.java (original)
+++ incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java Wed Aug 16 22:10:13 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.spi.annotation;
+package org.apache.tuscany.api.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Propchange: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/Bootstrapper.java Wed Aug 16 22:10:13 2006
@@ -28,7 +28,7 @@
import org.apache.tuscany.spi.deployer.Deployer;
import org.apache.tuscany.spi.loader.Loader;
import org.apache.tuscany.spi.loader.StAXPropertyFactory;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
/**
* Interface that abstracts the process used to create a running Tuscany system.
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/bootstrap/DefaultBootstrapper.java Wed Aug 16 22:10:13 2006
@@ -32,7 +32,7 @@
import org.apache.tuscany.spi.extension.LoaderExtension;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.StAXPropertyFactory;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.core.builder.BuilderRegistryImpl;
import org.apache.tuscany.core.builder.ConnectorImpl;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/IntrospectionRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/IntrospectionRegistryImpl.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/IntrospectionRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/IntrospectionRegistryImpl.java Wed Aug 16 22:10:13 2006
@@ -47,7 +47,7 @@
this.monitor = monitor;
}
- @org.apache.tuscany.spi.annotation.Monitor
+ @org.apache.tuscany.api.annotation.Monitor
public void setMonitor(Monitor monitor) {
this.monitor = monitor;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaComponentBuilder.java Wed Aug 16 22:10:13 2006
@@ -23,7 +23,7 @@
import java.lang.reflect.Method;
import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.annotation.Monitor;
+import org.apache.tuscany.api.annotation.Monitor;
import org.apache.tuscany.spi.builder.BuilderConfigException;
import org.apache.tuscany.spi.component.AtomicComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/implementation/processor/MonitorProcessor.java Wed Aug 16 22:10:13 2006
@@ -21,10 +21,10 @@
import org.apache.tuscany.core.implementation.JavaMappedProperty;
import org.apache.tuscany.core.injection.SingletonObjectFactory;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.annotation.Monitor;
+import org.apache.tuscany.api.annotation.Monitor;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
/**
* Processes an {@link @Monitor} annotation, updating the component type with corresponding
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java Wed Aug 16 22:10:13 2006
@@ -6,15 +6,15 @@
* 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.
+ * under the License.
*/
package org.apache.tuscany.core.launcher;
@@ -33,7 +33,7 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeImplementation;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.spi.services.info.RuntimeInfo;
/**
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java Wed Aug 16 22:10:13 2006
@@ -31,7 +31,7 @@
import org.apache.tuscany.core.monitor.MonitorFactoryUtil;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
/**
* Launcher for runtime environment that loads info from servlet context params.
@@ -137,7 +137,7 @@
component.start();
context = new CompositeContextImpl(component);
context.start();
-
+
} catch (Throwable t) {
servletContext.setAttribute(LAUNCHER_THROWABLE_ATTRIBUTE, t);
t.printStackTrace();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/loader/LoaderRegistryImpl.java Wed Aug 16 22:10:13 2006
@@ -61,7 +61,7 @@
this.monitor = monitor;
}
- @org.apache.tuscany.spi.annotation.Monitor
+ @org.apache.tuscany.api.annotation.Monitor
public void setMonitor(Monitor monitor) {
this.monitor = monitor;
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/JavaLoggingMonitorFactory.java Wed Aug 16 22:10:13 2006
@@ -33,8 +33,8 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import org.apache.tuscany.spi.monitor.LogLevel;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.api.annotation.LogLevel;
+import org.apache.tuscany.host.MonitorFactory;
/**
* A factory for monitors that forwards events to a {@link java.util.logging.Logger Java Logging (JSR47) Logger}.
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/MonitorFactoryUtil.java Wed Aug 16 22:10:13 2006
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.monitor;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
import java.util.Map;
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/monitor/NullMonitorFactory.java Wed Aug 16 22:10:13 2006
@@ -25,7 +25,7 @@
import org.osoa.sca.annotations.Init;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.host.MonitorFactory;
/**
* Implementation of a {@link MonitorFactory} that produces implementations that simply return.
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/policy/async/AsyncPolicyBuilder.java Wed Aug 16 22:10:13 2006
@@ -62,7 +62,7 @@
this.builderRegistry = builderRegistry;
}
- @org.apache.tuscany.spi.annotation.Monitor
+ @org.apache.tuscany.api.annotation.Monitor
public void setMonitor(AsyncMonitor monitor) {
this.monitor = monitor;
}
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/implementation/processor/MonitorProcessorTestCase.java Wed Aug 16 22:10:13 2006
@@ -23,8 +23,8 @@
import java.lang.reflect.Method;
import java.util.Map;
-import org.apache.tuscany.spi.annotation.Monitor;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.api.annotation.Monitor;
+import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.core.implementation.ConstructorDefinition;
import org.apache.tuscany.core.implementation.JavaMappedProperty;
Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/monitor/JavaLoggingTestCase.java Wed Aug 16 22:10:13 2006
@@ -26,8 +26,8 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import org.apache.tuscany.spi.monitor.LogLevel;
-import org.apache.tuscany.spi.monitor.MonitorFactory;
+import org.apache.tuscany.api.annotation.LogLevel;
+import org.apache.tuscany.host.MonitorFactory;
import junit.framework.TestCase;
Modified: incubator/tuscany/java/sca/host-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/host-api/pom.xml?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/host-api/pom.xml (original)
+++ incubator/tuscany/java/sca/host-api/pom.xml Wed Aug 16 22:10:13 2006
@@ -30,5 +30,11 @@
<description>Tuscany Host Programming Interfaces.</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany</groupId>
+ <artifactId>api</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
Added: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java?rev=432142&view=auto
==============================================================================
--- incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java (added)
+++ incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java Wed Aug 16 22:10:13 2006
@@ -0,0 +1,28 @@
+/*
+ * 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.host;
+
+import java.net.URL;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface Launcher {
+ void bootRuntime(URL systemScdl, MonitorFactory monitorFactory);
+}
Propchange: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java?rev=432142&view=auto
==============================================================================
--- incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java (added)
+++ incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java Wed Aug 16 22:10:13 2006
@@ -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.host;
+
+import java.util.Map;
+
+/**
+ * A MonitorFactory creates implementations of components' monitor interfaces that interface with a its monitoring
+ * scheme. For example, a implementation may create versions that emit appropriate logging events or which send
+ * notifications to a management API.
+ *
+ * MonitorFactory implementations must provide a no-arg constructor and implement the {@link #initialize} method
+ * to perform configuration of instances created using that constructor. Additional constructors may be defined;
+ * typically their implementations delegate to {@link #initialize}.
+ *
+ * @version $Rev$ $Date$
+ */
+public interface MonitorFactory {
+ /**
+ * Initializes MonitorFactory instances with implementation-specific configuration properties.
+ *
+ * @param configProperties a map of named configuration properties. May be null.
+ * @throws IllegalArgumentException if the instance can't be configured using the supplied properties
+ */
+ void initialize(Map<String, Object> configProperties);
+ /**
+ * Return a monitor for a component's monitor interface.
+ *
+ * @param monitorInterface the component's monitoring interface
+ * @return an implementation of the monitoring interface; will not be null
+ */
+ <T> T getMonitor(Class<T> monitorInterface);
+}
Propchange: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/MonitorFactory.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/idl/wsdl/src/main/java/org/apache/tuscany/idl/wsdl/WSDLDefinitionRegistryImpl.java Wed Aug 16 22:10:13 2006
@@ -54,7 +54,7 @@
registry = wsdlFactory.newPopulatedExtensionRegistry();
}
- @org.apache.tuscany.spi.annotation.Monitor
+ @org.apache.tuscany.api.annotation.Monitor
public void setMonitor(Monitor monitor) {
this.monitor = monitor;
}
Modified: incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/services/transports/http.jetty/src/main/java/org/apache/tuscany/service/jetty/JettyServiceImpl.java Wed Aug 16 22:10:13 2006
@@ -30,7 +30,7 @@
import org.osoa.sca.annotations.Service;
import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.annotation.Monitor;
+import org.apache.tuscany.api.annotation.Monitor;
import org.apache.tuscany.spi.host.ServletHost;
import org.apache.tuscany.spi.services.work.WorkScheduler;
Modified: incubator/tuscany/java/sca/spi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/pom.xml?rev=432142&r1=432141&r2=432142&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/pom.xml (original)
+++ incubator/tuscany/java/sca/spi/pom.xml Wed Aug 16 22:10:13 2006
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany</groupId>
- <artifactId>api</artifactId>
+ <artifactId>host-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org