Author: jboynes
Date: Mon Sep 25 17:01:40 2006
New Revision: 449867
URL: http://svn.apache.org/viewvc?view=rev&rev=449867
Log:
move DirectoryScanExtender into standalone host where we know we will have a
directory
Added:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
(contents, props changed)
- copied, changed from r449840,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java
(with props)
Removed:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java
Modified:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
incubator/tuscany/java/sca/runtime/standalone-host/pom.xml
incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
Modified:
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl?view=diff&rev=449867&r1=449866&r2=449867
==============================================================================
---
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
(original)
+++
incubator/tuscany/java/samples/sca/helloworldws/src/main/webapp/META-INF/tuscany/webapp.scdl
Mon Sep 25 17:01:40 2006
@@ -98,7 +98,7 @@
<!-- component that scans the extension directory -->
<component name="directoryScanExtender">
- <system:implementation.system
class="org.apache.tuscany.core.services.extension.DirectoryScanExtender"/>
+ <system:implementation.system
class="org.apache.tuscany.runtime.standalone.host.DirectoryScanExtender"/>
<property name="path">extension</property>
</component>
Modified:
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=449867&r1=449866&r2=449867
==============================================================================
---
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
(original)
+++
incubator/tuscany/java/sca/commands/launcher/src/main/resources/META-INF/tuscany/system.scdl
Mon Sep 25 17:01:40 2006
@@ -98,7 +98,7 @@
<!-- component that scans the extension directory -->
<component name="directoryScanExtender" initLevel="90">
- <system:implementation.system
class="org.apache.tuscany.core.services.extension.DirectoryScanExtender"/>
+ <system:implementation.system
class="org.apache.tuscany.runtime.standalone.host.DirectoryScanExtender"/>
<property name="path">extension</property>
</component>
Modified: incubator/tuscany/java/sca/runtime/standalone-host/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone-host/pom.xml?view=diff&rev=449867&r1=449866&r2=449867
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone-host/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone-host/pom.xml Mon Sep 25
17:01:40 2006
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-spi</artifactId>
+ <artifactId>core</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
Copied:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
(from r449840,
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java?view=diff&rev=449867&p1=incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java&r1=449840&p2=incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java&r2=449867
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/services/extension/DirectoryScanExtender.java
(original)
+++
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
Mon Sep 25 17:01:40 2006
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.core.services.extension;
+package org.apache.tuscany.runtime.standalone.host;
import java.io.File;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Property;
+import org.apache.tuscany.core.services.extension.AbstractExtensionDeployer;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.services.VoidService;
-import org.apache.tuscany.spi.services.info.RuntimeInfo;
/**
* Service that extends the runtime by loading composites located in a
directory.
@@ -33,17 +33,13 @@
* @version $Rev$ $Date$
*/
public class DirectoryScanExtender extends AbstractExtensionDeployer
implements VoidService {
- private String path;
- private RuntimeInfo runtimeInfo;
+ private final StandaloneRuntimeInfo runtimeInfo;
+ private final String path;
- @Property
- public void setPath(String path) {
- this.path = path;
- }
-
- @Autowire
- public void setRuntimeInfo(RuntimeInfo runtimeInfo) {
+ public DirectoryScanExtender(@Autowire StandaloneRuntimeInfo runtimeInfo,
+ @Property String path) {
this.runtimeInfo = runtimeInfo;
+ this.path = path;
}
@Init(eager = true)
Propchange:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/DirectoryScanExtender.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java?view=auto&rev=449867
==============================================================================
---
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java
(added)
+++
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java
Mon Sep 25 17:01:40 2006
@@ -0,0 +1,27 @@
+/*
+ * 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.runtime.standalone.host;
+
+import org.apache.tuscany.spi.services.info.RuntimeInfo;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface StandaloneRuntimeInfo extends RuntimeInfo {
+}
Propchange:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/runtime/standalone-host/src/main/java/org/apache/tuscany/runtime/standalone/host/StandaloneRuntimeInfo.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl?view=diff&rev=449867&r1=449866&r2=449867
==============================================================================
---
incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
(original)
+++
incubator/tuscany/java/sca/runtime/webapp-host/src/main/resources/META-INF/tuscany/webapp.scdl
Mon Sep 25 17:01:40 2006
@@ -96,12 +96,6 @@
<!-- Java implementation type -->
<include name="org.apache.tuscany.launcher.JavaImplementation"
scdlResource="org/apache/tuscany/core/javaImplementation.scdl"/>
- <!-- component that scans the extension directory -->
- <component name="directoryScanExtender">
- <system:implementation.system
class="org.apache.tuscany.core.services.extension.DirectoryScanExtender"/>
- <property name="path">extension</property>
- </component>
-
<!-- WorkScheduler service -->
<component name="workManager">
<system:implementation.system
Modified:
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl?view=diff&rev=449867&r1=449866&r2=449867
==============================================================================
---
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
(original)
+++
incubator/tuscany/java/sca/test/src/main/resources/META-INF/tuscany/system.scdl
Mon Sep 25 17:01:40 2006
@@ -99,12 +99,6 @@
<!-- System implementation type -->
<include name="org.apache.tuscany.test.TestBindingImplementation"
scdlLocation="test.binding.system.scdl"/>
- <!-- component that scans the extension directory -->
- <component name="directoryScanExtender" initLevel="90">
- <system:implementation.system
class="org.apache.tuscany.core.services.extension.DirectoryScanExtender"/>
- <property name="path">extension</property>
- </component>
-
<!-- service for resolving artifacts against the user's local Maven
repository -->
<component name="artifactRepository">
<system:implementation.system
class="org.apache.tuscany.core.services.artifact.LocalMavenRepository"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
