You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/01/17 20:49:18 UTC
svn commit: r900205 - in
/tuscany/sandbox/travelsample/contributions/emailgateway/src:
main/resources/ main/resources/META-INF/ test/java/scatours/emailgateway/
test/resources/ test/resources/META-INF/
Author: slaws
Date: Sun Jan 17 19:49:17 2010
New Revision: 900205
URL: http://svn.apache.org/viewvc?rev=900205&view=rev
Log:
Tidy up test composite structure
Added:
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite (with props)
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
- copied, changed from r900195, tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
Removed:
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite
Modified:
tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml?rev=900205&r1=900204&r2=900205&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml Sun Jan 17 19:49:17 2010
@@ -17,7 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:e="http://emailgateway" >
<export.java package="com.tuscanyscatours.emailgateway" />
<export.java package="com.tuscanyscatours.emailgateway.impl" />
+ <deployable composite="e:emailgateway" />
</contribution>
Added: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite?rev=900205&view=auto
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite (added)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite Sun Jan 17 19:49:17 2010
@@ -0,0 +1,32 @@
+<?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"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ xmlns:e="http://emailgateway"
+ targetNamespace="http://emailgateway"
+ name="emailgateway">
+
+ <component name="EmailGateway">
+ <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
+ <service name="EmailGateway">
+ <binding.ws uri="http://localhost:8088/EmailGateway" />
+ </service>
+ </component>
+</composite>
Propchange: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: tuscany/sandbox/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java?rev=900205&r1=900204&r2=900205&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java Sun Jan 17 19:49:17 2010
@@ -44,7 +44,7 @@
public static void setUpBeforeClass() throws Exception {
SCANodeFactory factory = SCANodeFactory.newInstance();
node =
- factory.createSCANode("emailgateway.composite",
+ factory.createSCANode(null,
new SCAContribution("emailgateway", "./target/classes"),
new SCAContribution("emailgateway-test", "./target/test-classes"));
node.start();
Modified: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml?rev=900205&r1=900204&r2=900205&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml Sun Jan 17 19:49:17 2010
@@ -17,7 +17,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:e="http://emailgateway-test">
<import.java package="com.tuscanyscatours.emailgateway" />
<import.java package="com.tuscanyscatours.emailgateway.impl" />
+ <deployable composite="e:emailgateway-test" />
</contribution>
Copied: tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite (from r900195, tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite?p2=tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite&p1=tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite&r1=900195&r2=900205&rev=900205&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway.composite (original)
+++ tuscany/sandbox/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite Sun Jan 17 19:49:17 2010
@@ -19,19 +19,14 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:c="http://creditcard"
- targetNamespace="http://creditcard"
- name="emailgateway">
+ xmlns:e="http://emailgateway-test"
+ targetNamespace="http://emailgateway-test"
+ name="emailgateway-test">
<component name="EmailGatewayClient">
<implementation.java class="scatours.emailgateway.client.impl.EmailGatewayClientImpl" />
<reference name="emailGateway">
<binding.ws uri="http://localhost:8088/EmailGateway" />
</reference>
</component>
- <component name="EmailGateway">
- <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
- <service name="EmailGateway">
- <binding.ws uri="http://localhost:8088/EmailGateway" />
- </service>
- </component>
+
</composite>