Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835694 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 0 insertions, 633 deletions

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/README b/branches/sca-java-1.5.2/samples/binding-notification-broker/README
deleted file mode 100644
index c21b8a5a1c..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/README
+++ /dev/null
@@ -1,112 +0,0 @@
-Notification Broker Binding Sample

-==================================

-

-This sample illustrates the use of <binding.notification/> with a

-broker.

-

-The README in the samples directory (the directory above this) provides 

-general instructions about building and running samples. Take a look there 

-first. 

-

-Sample Overview

----------------

-

-This sample illustrates the use of a notification broker that is located in a

-separate (and remote) composite with respect to any producers or consumers. As

-such, this sample is run in conjunction with the binding-notification-producer

-sample, the binding-notification-consumer sample, or both. Take a look at the

-composite file or the .svg file which shows the composite file in pictorial form.

-The composite service and composite reference each have a <binding.notification/>

-that handles the remote communication. This binding includes an 'ntm' attribute

-that refers to the notification type manager, which manages the connectivity of

-producers, consumers and brokers, and which (for this sample) is assumed to be

-running on http://localhost:8083. The ntm is a system component that is included in

-and runs as part of the binding-notification module.

-This sample also illustrates the use of a wsdl interface in the notification

-component's <implementation.notification/>. This allows messages sent and received

-via <binding.notification/> to be transported as literal xml over http.

-

-Sample Usage

-------------

-

-This sample is run using the tuscany binary distribution. To run it, navigate to this sample's directory and 

-

-on Wondows, use following command:

-

-java -Dnotification.httpPort=8080 -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-binding-notification-broker.jar  notification.broker.TrafficAdvisoryServer

-

-on *nix, use following command:

-

-java -Dnotification.httpPort=8080 -cp ../../lib/tuscany-sca-manifest.jar:target/sample-binding-notification-broker.jar notification.broker.TrafficAdvisoryServer

-

-this should bring up the following prompt:

-

-Send a report value, ^C or <end> to end

-

-at this point you should be able to type a message to send, for instance:

-

-Traffic congestion

-

-Notice that before you try to receive any message, you should bring up the

-consumer sample or another broker sample. When you have finished using this

-sample, type 'end' or ^C to end.

-

-Also notice that '-Dnotification.httpPort=8080' is used in the java command.

-This indicates the port the sample should use. This also says that this server

-is not going to play the role of ntm, given our previous assumption. It is important

-that the first one of the producer, consumer or broker sample that is run be the

-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk

-to and an exception will be thrown.

-

-Sample directory structure:

----------------------------

-

-binding-notification-broker/

-  src/

-    main/

-      java/

-        notification.broker/

-          TestCaseProducer.java                    - interface for the producer component

-          TrafficAdvisory.java                     - remote interface referred to by the producer component

-                                                     and for the consumer component

-          TrafficAdvisoryConsumer.java             - implementation for the consumer components

-          TrafficAdvisoryProducer.java             - implementation for the producer component

-          TrafficAdvisoryServer.java               - server class including main entry point

-      resources/

-        wsdl/

-          TrafficAdvisory.wsdl                     - remote interface for the notification component

-        TrafficAdvisoryNotification.componentType  - the component type referred to by

-                                                     <implementation.notification/>

-        TrafficAdvisoryNotification.composite      - the main composite including producer, consumer and

-                                                     notification components, and composite service and reference

-  binding-notification-broker.png                  - a pictorial representation of the sample .composite file

-  build.xml                       		   - the Ant build file

-  pom.xml                                          - the Maven build file 

-

-Building And Running The Sample Using Ant

------------------------------------------

-With the binary distribution the sample can be built and run using Ant as 

-follows

-

-cd binding-notification-broker

-ant compile

-ant run

-

-You should see the following output from the run target.

-

-run:

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory

-     [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping

-     [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory

-     

-Building And Running The Sample Using Maven 

--------------------------------------------

-

-With either the binary or source distributions the sample can be built and run 

-using Maven as follows. 

-

-cd binding-notification-broker

-mvn

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/binding-notification-broker.png b/branches/sca-java-1.5.2/samples/binding-notification-broker/binding-notification-broker.png
deleted file mode 100644
index 49030650f2..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/binding-notification-broker.png
+++ /dev/null
diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/build.xml b/branches/sca-java-1.5.2/samples/binding-notification-broker/build.xml
deleted file mode 100644
index a042b9036a..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!--

- * 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.    

--->

-<project name="binding-notification-broker" default="compile">

-    <property name="test.class" value="notification.broker.TrafficAdvisoryServer" />

-	<property name="test.jar"   value="sample-binding-notification-broker.jar" />

-	

-    <target name="init">

-        <mkdir dir="target/classes"/>

-    </target>

-	

-    <target name="compile" depends="init">

-        <javac srcdir="src/main/java"

-               destdir="target/classes"

-               debug="on"

-               source="1.5"

-               target="1.5">

-            <classpath>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac> 

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-        <jar destfile="target/${test.jar}" basedir="target/classes">

-            <manifest>

-                <attribute name="Main-Class" value="${test.class}" /> 

-            </manifest>

-        </jar>    	

-    </target>	

-	

-    <target name="run-classes">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/classes"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

-        	<arg value="end"/>

-        </java>

-    </target>

-	

-    <target name="run">

-        <java classname="${test.class}"

-              fork="true">

-            <classpath>

-                <pathelement path="target/${test.jar}"/>

-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        	<sysproperty key="notification.httpPort" value="8083"/>

-        </java>    	

-    </target>

-	

-    <target name="clean">

-        <delete quiet="true" includeemptydirs="true">

-            <fileset dir="target"/>

-        </delete>

-    </target>

-</project>

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/pom.xml b/branches/sca-java-1.5.2/samples/binding-notification-broker/pom.xml
deleted file mode 100644
index 0a8b9f16b7..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.5.2-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-binding-notification-broker</artifactId>
-    <name>Apache Tuscany SCA Sample Notification Binding Broker</name>
-    <version>1.5.2-SNAPSHOT</version>
-    <description>A sample illustrating use of binding.notification</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-notification</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-notification</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>  
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
-            <version>1.5.2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>     
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-	<finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-        <defaultGoal>install</defaultGoal>
-    </build>
-</project>
diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
deleted file mode 100644
index 35fa1a9ee9..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*

- * 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 notification.broker;

-

-public interface TestCaseProducer {

-

-    public void produceTrafficNotification(String report);

-}

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
deleted file mode 100644
index d5bc8fbb50..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*

- * 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 notification.broker;

-

-import org.osoa.sca.annotations.Remotable;

-

-/**

- * @version $Rev$ $Date$

- */

-@Remotable

-public interface TrafficAdvisory {

-

-    void trafficNotification(String report);

-}

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
deleted file mode 100644
index cd3befe076..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*

- * 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 notification.broker;

-

-import org.osoa.sca.annotations.AllowsPassByReference;

-import org.osoa.sca.annotations.Property;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

-

-/**

- * @version $Rev$ $Date$

- */

-@Service(TrafficAdvisory.class)

-@Scope("COMPOSITE")

-@AllowsPassByReference

-public class TrafficAdvisoryConsumer implements TrafficAdvisory {

-    

-    @Property

-    protected String name;

-

-    public void trafficNotification(String report) {

-        

-        System.out.println("Consumer [" + name + "] received report: " + report);

-    }

-}

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
deleted file mode 100644
index 8caefaf1d2..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*

- * 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 notification.broker;

-

-import org.osoa.sca.annotations.Reference;

-import org.osoa.sca.annotations.Scope;

-import org.osoa.sca.annotations.Service;

-

-@Service(TestCaseProducer.class)

-@Scope("COMPOSITE")

-public class TrafficAdvisoryProducer implements TestCaseProducer {

-    

-    @Reference

-    protected TrafficAdvisory destination;

-

-    public void produceTrafficNotification(String report) {

-        

-        destination.trafficNotification(report);

-    }

-}

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
deleted file mode 100644
index b0f0d2a800..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*

- * 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 notification.broker;

-

-import java.io.BufferedReader;

-import java.io.IOException;

-import java.io.InputStreamReader;

-import java.net.URI;

-

-import org.apache.tuscany.sca.binding.notification.NotificationBindingProviderFactory;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * @version $Rev$ $Date$

- */

-public class TrafficAdvisoryServer {

-    

-    private static URI notificationType;

-

-    public static void main(String[] args) {

-        try {

-            notificationType = new URI("trafficAdvisory");

-            String compositeName = "TrafficAdvisoryNotification.composite";

-            SCADomain domain = SCADomain.newInstance(compositeName);

-            TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");

-

-            BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));

-            String value = "";

-            if (args.length == 1) {

-                value = args[0];

-            }

-            do {

-                if(value == null || value.equals("end")) {

-                    break;

-                }

-                try {

-                    System.out.println("Send a report value, ^C or <end> to end");

-                    value = reader.readLine();

-                } catch (IOException e) {

-                    e.printStackTrace();

-                }

-                if (value.equals("rb")) {

-                    NotificationBindingProviderFactory.removeBroker(notificationType);

-                }

-                else {

-                    testCaseProducer.produceTrafficNotification("Report value [" + value + "]");

-                }

-            }

-            while(true);

-

-            domain.close();

-        } catch(Throwable e) {

-            e.printStackTrace();

-        }

-    }

-}

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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.    

--->

-

-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">

-     <service name="TrafficAdvisoryNotificationService">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </service>

-

-     <reference name="TrafficAdvisoryNotificationReference"

-                multiplicity="0..n">

-           <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-               wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-           </interface.wsdl>

-     </reference>

-</componentType>

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index f490c34ea6..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>

-<!--

- * 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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"

-           xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"

-           name="TrafficAdvisoryNotificationBrokerComposite">

-

-    <service name="TrafficAdvisoryNotificationCompositeService"

-             promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">

-        <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-            wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-        </interface.wsdl>

-        <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>

-    </service>

-             

-    <component name="TrafficAdvisoryProducer">

-		<implementation.java class="notification.broker.TrafficAdvisoryProducer"/>

-        <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>

-    </component>

-

-    <component name="TrafficAdvisoryNotificationComponent">

-        <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>

-        <!-- Never use > 1 reference elements here !! -->

-        <reference name="TrafficAdvisoryNotificationReference"

-                   multiplicity="0..n"

-                   target="TrafficAdvisoryConsumer1"/>

-    </component>

-    

-    <component name="TrafficAdvisoryConsumer1">

-        <implementation.java class="notification.broker.TrafficAdvisoryConsumer"/>

-        <property name="name">Consumer1</property>

-    </component>

-    

-    <reference name="TrafficAdvisoryNotificationCompositeReference"

-               promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">

-        <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"

-            wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">

-        </interface.wsdl>

-        <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>

-    </reference>

-

-</composite>

diff --git a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-java-1.5.2/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>

-<!--

- * 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.

--->

-<definitions name="TrafficAdvisory"

-             targetNamespace="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:tns="http://example.com/TrafficAdvisory.wsdl"

-             xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"

-             xmlns="http://schemas.xmlsoap.org/wsdl/">

-

-    <types>

-        <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"

-                xmlns:tns="http://example.com/TrafficAdvisory.xsd"

-                xmlns="http://www.w3.org/2001/XMLSchema">

-            <element name="trafficNotification">

-                <complexType>

-                    <sequence>

-                        <element name="report" type="string" />

-                    </sequence>

-                </complexType>

-            </element>

-        </schema>

-    </types>

-

-    <message name="TrafficNotificationInput">

-        <part name="body" element="xsd1:trafficNotification" />

-    </message>

-

-    <portType name="TrafficAdvisoryPortType">

-        <operation name="trafficNotification">

-            <input message="tns:TrafficNotificationInput" />

-        </operation>

-    </portType>

-

-</definitions>