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/09/07 21:32:48 UTC
svn commit: r441186 - in /incubator/tuscany/java:
distribution/sca/standalone/src/main/assembly/ sca/ sca/commands/launcher/
sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/
sca/hostutil/ sca/kernel/host-api/src/main/java/org/apache/tus...
Author: jboynes
Date: Thu Sep 7 12:32:47 2006
New Revision: 441186
URL: http://svn.apache.org/viewvc?view=rev&rev=441186
Log:
remove hostutil module and merge helper into host-api
Added:
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/
incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java (contents, props changed)
- copied, changed from r441162, incubator/tuscany/java/sca/hostutil/src/main/java/org/apache/tuscany/hostutil/LaunchHelper.java
incubator/tuscany/java/sca/kernel/host-api/src/test/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/
incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java (contents, props changed)
- copied, changed from r441162, incubator/tuscany/java/sca/hostutil/src/test/java/org/apache/tuscany/hostutil/LaunchHelperTestCase.java
Removed:
incubator/tuscany/java/sca/hostutil/
Modified:
incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
incubator/tuscany/java/sca/commands/launcher/pom.xml
incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java
incubator/tuscany/java/sca/pom.xml
Modified: incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml?view=diff&rev=441186&r1=441185&r2=441186
==============================================================================
--- incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml (original)
+++ incubator/tuscany/java/distribution/sca/standalone/src/main/assembly/standalone.xml Thu Sep 7 12:32:47 2006
@@ -45,7 +45,7 @@
</includes>
<excludes>
<exclude>org.osoa:sca-api</exclude>
- <exclude>org.apache.tuscany:hostutil</exclude>
+ <exclude>org.apache.tuscany.sca.kernel:tuscany-host-api</exclude>
</excludes>
<fileMode>755</fileMode>
</dependencySet>
@@ -55,7 +55,7 @@
<outputDirectory>bin</outputDirectory>
<includes>
<include>org.osoa:sca-api</include>
- <include>org.apache.tuscany:hostutil</include>
+ <include>org.apache.tuscany.sca.kernel:tuscany-host-api</include>
</includes>
<fileMode>644</fileMode>
</dependencySet>
Modified: incubator/tuscany/java/sca/commands/launcher/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/pom.xml?view=diff&rev=441186&r1=441185&r2=441186
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/pom.xml (original)
+++ incubator/tuscany/java/sca/commands/launcher/pom.xml Thu Sep 7 12:32:47 2006
@@ -38,8 +38,8 @@
<artifactId>sca-api-r0.95</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>hostutil</artifactId>
+ <groupId>org.apache.tuscany.sca.kernel</groupId>
+ <artifactId>tuscany-host-api</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
Modified: incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java?view=diff&rev=441186&r1=441185&r2=441186
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java (original)
+++ incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java Thu Sep 7 12:32:47 2006
@@ -26,7 +26,7 @@
import java.net.URLClassLoader;
import java.util.ResourceBundle;
-import org.apache.tuscany.hostutil.LaunchHelper;
+import org.apache.tuscany.host.util.LaunchHelper;
/**
* Launcher for launcher runtime environment that invokes a jar's Main class.
Copied: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java (from r441162, incubator/tuscany/java/sca/hostutil/src/main/java/org/apache/tuscany/hostutil/LaunchHelper.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java?view=diff&rev=441186&p1=incubator/tuscany/java/sca/hostutil/src/main/java/org/apache/tuscany/hostutil/LaunchHelper.java&r1=441162&p2=incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java&r2=441186
==============================================================================
--- incubator/tuscany/java/sca/hostutil/src/main/java/org/apache/tuscany/hostutil/LaunchHelper.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java Thu Sep 7 12:32:47 2006
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.hostutil;
+package org.apache.tuscany.host.util;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/main/java/org/apache/tuscany/host/util/LaunchHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java (from r441162, incubator/tuscany/java/sca/hostutil/src/test/java/org/apache/tuscany/hostutil/LaunchHelperTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java?view=diff&rev=441186&p1=incubator/tuscany/java/sca/hostutil/src/test/java/org/apache/tuscany/hostutil/LaunchHelperTestCase.java&r1=441162&p2=incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java&r2=441186
==============================================================================
--- incubator/tuscany/java/sca/hostutil/src/test/java/org/apache/tuscany/hostutil/LaunchHelperTestCase.java (original)
+++ incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java Thu Sep 7 12:32:47 2006
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.hostutil;
+package org.apache.tuscany.host.util;
+import junit.framework.Assert;
import junit.framework.TestCase;
/**
@@ -34,7 +35,7 @@
public void testSetObject() {
LaunchHelper.setProperty(instance, "string", "Hello");
- assertEquals("Hello", instance.aString);
+ Assert.assertEquals("Hello", instance.aString);
}
protected void setUp() throws Exception {
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/kernel/host-api/src/test/java/org/apache/tuscany/host/util/LaunchHelperTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/pom.xml?view=diff&rev=441186&r1=441185&r2=441186
==============================================================================
--- incubator/tuscany/java/sca/pom.xml (original)
+++ incubator/tuscany/java/sca/pom.xml Thu Sep 7 12:32:47 2006
@@ -36,7 +36,6 @@
<module>idl/wsdl</module>
<module>databinding</module>
<module>bindings</module>
- <module>hostutil</module>
<module>runtime/webapp</module>
<module>runtime/webapp-host</module>
<module>commands/launcher</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org