Author: antelder
Date: Sat Dec 1 02:39:38 2007
New Revision: 600080
URL: http://svn.apache.org/viewvc?rev=600080&view=rev
Log:
Change sample to have composite in deployables folder
Added:
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java
- copied, changed from r599368,
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
Removed:
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/helloworldws.composite
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
Added:
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite?rev=600080&view=auto
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
(added)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/resources/META-INF/sca-deployables/helloworldws.composite
Sat Dec 1 02:39:38 2007
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ targetNamespace="http://helloworld"
+ xmlns:hw="http://helloworld"
+ name="helloworldws">
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="helloworld.HelloWorldImpl" />
+ <service name="HelloWorldService">
+ <interface.wsdl
interface="http://helloworld#wsdl.interface(HelloWorld)" />
+ <binding.ws uri="http://localhost:8085/HelloWorldService"/>
+ </service>
+ </component>
+
+</composite>
Copied:
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java
(from r599368,
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java?p2=incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java&p1=incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java&r1=599368&r2=600080&rev=600080&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/main/java/helloworld/HelloWorldServer.java
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServer.java
Sat Dec 1 02:39:38 2007
@@ -30,7 +30,7 @@
public static void main(String[] args) {
- SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");
+ SCADomain scaDomain =
SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");
try {
System.out.println("HelloWorld server started (press enter to
shutdown)");
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java?rev=600080&r1=600079&r2=600080&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-ws-service/src/test/java/helloworld/HelloWorldServerTestCase.java
Sat Dec 1 02:39:38 2007
@@ -38,7 +38,7 @@
@Before
public void startServer() throws Exception {
- scaDomain = SCADomain.newInstance("helloworldws.composite");
+ scaDomain =
SCADomain.newInstance("META-INF/sca-deployables/helloworldws.composite");
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]