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 2007/09/20 22:44:04 UTC
svn commit: r577910 [3/6] - in /incubator/tuscany/java/sca: ./
demos/mortgage-creditcheck/
demos/mortgage-creditcheck/src/main/webapp/META-INF/ distribution/
distribution/bundle/ distribution/manifest/ distribution/src/main/assembly/
distribution/src/m...
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Thu Sep 20 13:43:32 2007
@@ -72,6 +72,7 @@
<module>wsdl</module>
<module>wsdlless</module>
<module>wsdl2java</module>
+ <module>ws-void-args-return</module>
</modules>
</profile>
Modified: incubator/tuscany/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/java/mysca/test/myservice/impl/MyServiceImpl.java Thu Sep 20 13:43:32 2007
@@ -37,7 +37,7 @@
protected String year = "2006";
@ComponentName
- private String componentName;
+ protected String componentName;
private Logger logger;
Modified: incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite (original)
+++ incubator/tuscany/java/sca/itest/properties/src/main/resources/PropertyTest.composite Thu Sep 20 13:43:32 2007
@@ -20,6 +20,7 @@
xmlns:foo="http://foo"
xmlns:cust="http://www.example.com/Customer"
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://foo"
name="PropertyTest"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
Modified: incubator/tuscany/java/sca/itest/scopes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/scopes/pom.xml?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/scopes/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/scopes/pom.xml Thu Sep 20 13:43:32 2007
@@ -32,16 +32,16 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-embedded</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.1-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Propchange: incubator/tuscany/java/sca/itest/ws-void-args-return/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 20 13:43:32 2007
@@ -0,0 +1,5 @@
+*.classpath
+*.project
+.settings
+target
+work
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/pom.xml?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/pom.xml (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/pom.xml Thu Sep 20 13:43:32 2007
@@ -0,0 +1,61 @@
+<?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-itest</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>itest-ws-void-args-return</artifactId>
+ <name>Apache Tuscany SCA Web Services Void Args and Return Test</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-tomcat</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldImpl.java Thu Sep 20 13:43:32 2007
@@ -0,0 +1,49 @@
+/*
+ * 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 voidtest;
+
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldImpl implements HelloWorldService {
+
+ public String getGreetings(String name) {
+ return "Hello " + name;
+ }
+
+ public void giveGreetings(String name) {
+ System.out.println("Hello " + name);
+ }
+
+ public void giveGreetingsOneWay(String name) {
+ System.out.println("Hi " + name);
+ }
+
+ public String takeGreetings() {
+ return "Hello Stranger";
+ }
+
+ public void noGreetings() {
+ System.out.println("Hello, who's there?");
+ }
+
+}
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/HelloWorldService.java Thu Sep 20 13:43:32 2007
@@ -0,0 +1,41 @@
+/*
+ * 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 voidtest;
+
+import org.osoa.sca.annotations.OneWay;
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * This is the business interface of the HelloWorld greetings service.
+ */
+@Remotable
+public interface HelloWorldService {
+
+ String getGreetings(String name);
+
+ void giveGreetings(String name);
+
+ @OneWay
+ void giveGreetingsOneWay(String name);
+
+ String takeGreetings();
+
+ void noGreetings();
+}
+
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClient.java Thu Sep 20 13:43:32 2007
@@ -0,0 +1,23 @@
+/*
+ * 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 voidtest;
+
+public interface TestClient {
+ void runTest();
+}
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/java/voidtest/TestClientImpl.java Thu Sep 20 13:43:32 2007
@@ -0,0 +1,45 @@
+/*
+ * 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 voidtest;
+
+import static junit.framework.Assert.assertEquals;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+@Service(TestClient.class)
+@Scope("COMPOSITE")
+public class TestClientImpl implements TestClient {
+
+ private HelloWorldService helloService;
+
+ @Reference
+ public void setHelloService(HelloWorldService helloService) {
+ this.helloService = helloService;
+ }
+
+ public void runTest() {
+ assertEquals("Hello Smith", helloService.getGreetings(" Smith"));
+ helloService.giveGreetings("Jones");
+ helloService.giveGreetingsOneWay("Brown");
+ assertEquals("Hello Stranger", helloService.takeGreetings());
+ helloService.noGreetings();
+ }
+}
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/resources/voidtest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/resources/voidtest.composite?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/resources/voidtest.composite (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/src/main/resources/voidtest.composite Thu Sep 20 13:43:32 2007
@@ -0,0 +1,41 @@
+<?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://voidtest"
+ xmlns:hw="http://voidtest"
+ name="voidtest">
+
+ <component name="TestClientComponent">
+ <implementation.java class="voidtest.TestClientImpl" />
+ <reference name="helloService">
+ <interface.java interface="voidtest.HelloWorldService"/>
+ <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent/HelloWorldService"/>
+ </reference>
+ </component>
+
+ <component name="HelloWorldServiceComponent">
+ <implementation.java class="voidtest.HelloWorldImpl" />
+ <service name="HelloWorldService">
+ <interface.java interface="voidtest.HelloWorldService"/>
+ <binding.ws uri="http://localhost:8085/HelloWorldServiceComponent/HelloWorldService"/>
+ </service>
+ </component>
+
+</composite>
Added: incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java?rev=577910&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java (added)
+++ incubator/tuscany/java/sca/itest/ws-void-args-return/src/test/java/voidtest/VoidArgsReturnTestCase.java Thu Sep 20 13:43:32 2007
@@ -0,0 +1,53 @@
+/*
+ * 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 voidtest;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests that methods with no args and/or void return type work over Web services
+ */
+public class VoidArgsReturnTestCase {
+
+ private SCADomain scaDomain;
+ private TestClient client;
+
+ @Before
+ public void startServer() throws Exception {
+ scaDomain = SCADomain.newInstance("voidtest.composite");
+ client = scaDomain.getService(TestClient.class, "TestClientComponent");
+ }
+
+ @Test
+ public void testVoidCases() throws Exception {
+ client.runTest();
+ System.out.println("Sleeping...");
+ Thread.sleep(2000);
+ }
+
+ @After
+ public void stopServer() throws Exception {
+ scaDomain.close();
+ }
+
+}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingModuleActivator.java Thu Sep 20 13:43:32 2007
@@ -18,38 +18,9 @@
*/
package org.apache.tuscany.sca.binding.notification;
-import java.net.InetAddress;
-
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReferenceEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerIDEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokerProducerReferenceEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.BrokersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ConsumerReferenceEnDeCoder;
import org.apache.tuscany.sca.binding.notification.encoding.DefaultEncodingRegistry;
-import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;
-import org.apache.tuscany.sca.binding.notification.encoding.EndConsumersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.EndProducersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddressEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.EndpointReferenceEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NeighborBrokerConsumersEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NeighborsEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerAckEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.NewProducerResponseEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ReferencePropertiesEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.RemoveBrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.RemovedBrokerEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnectionEnDeCoder;
-import org.apache.tuscany.sca.binding.notification.encoding.SubscribeEnDeCoder;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.ModuleActivator;
@@ -67,114 +38,14 @@
private NotificationBindingProcessor bindingProcessor;
- private NotificationTypeManagerImpl ntm;
-
- private SubscribeEnDeCoder subscribeEnDeCoder;
- private ConsumerReferenceEnDeCoder consumerReferenceEnDeCoder;
- private EndpointAddressEnDeCoder endpointAddressEnDeCoder;
- private NewConsumerEnDeCoder newConsumerEnDeCoder;
- private NewProducerEnDeCoder newProducerEnDeCoder;
- private NewConsumerResponseEnDeCoder newConsumerResponseEnDeCoder;
- private NewProducerResponseEnDeCoder newProducerResponseEnDeCoder;
- private NewBrokerEnDeCoder newBrokerEnDeCoder;
- private BrokerConsumerReferenceEnDeCoder brokerConsumerReferenceEnDeCoder;
- private BrokerProducerReferenceEnDeCoder brokerProducerReferenceEnDeCoder;
- private NewBrokerResponseEnDeCoder newBrokerResponseEnDeCoder;
- private BrokersEnDeCoder brokersEnDeCoder;
- private BrokerEnDeCoder brokerEnDeCoder;
- private EndConsumersEnDeCoder endConsumersEnDeCoder;
- private EndProducersEnDeCoder endProducersEnDeCoder;
- private EndpointReferenceEnDeCoder endpointReferenceEnDeCoder;;
- private ReferencePropertiesEnDeCoder referencePropertiesEnDeCoder;
- private BrokerIDEnDeCoder brokerIDEnDeCoder;
- private ConnectionOverrideEnDeCoder connectionOverrideEnDeCoder;
- private ConnectionOverrideResponseEnDeCoder connectionOverrideResponseEnDeCoder;
- private NewBrokerAckEnDeCoder newBrokerAckEnDeCoder;
- private NeighborBrokerConsumersEnDeCoder neighborBrokerConsumersEnDeCoder;
- private RemoveBrokerEnDeCoder removeBrokerEnDeCoder;
- private RemovedBrokerEnDeCoder removedBrokerEnDeCoder;
- private NeighborsEnDeCoder neighborsEnDeCoder;
- private ReplaceBrokerConnectionEnDeCoder replaceBrokerConnectionEnDeCoder;
+ private DefaultEncodingRegistry encodingRegistry;
+ private ServletHost servletHost;
- private static final String DEFAULT_PORT = "8086";
-
+
public void start(ExtensionPointRegistry registry) {
+ encodingRegistry = new DefaultEncodingRegistry();
+ servletHost = new ExtensibleServletHost(registry.getExtensionPoint(ServletHostExtensionPoint.class));
- EncodingRegistry encodingRegistry = new DefaultEncodingRegistry();
- subscribeEnDeCoder = new SubscribeEnDeCoder(encodingRegistry);
- subscribeEnDeCoder.start();
- consumerReferenceEnDeCoder = new ConsumerReferenceEnDeCoder(encodingRegistry);
- consumerReferenceEnDeCoder.start();
- endpointAddressEnDeCoder = new EndpointAddressEnDeCoder(encodingRegistry);
- endpointAddressEnDeCoder.start();
- newConsumerEnDeCoder = new NewConsumerEnDeCoder(encodingRegistry);
- newConsumerEnDeCoder.start();
- newProducerEnDeCoder = new NewProducerEnDeCoder(encodingRegistry);
- newProducerEnDeCoder.start();
- newConsumerResponseEnDeCoder = new NewConsumerResponseEnDeCoder(encodingRegistry);
- newConsumerResponseEnDeCoder.start();
- newProducerResponseEnDeCoder = new NewProducerResponseEnDeCoder(encodingRegistry);
- newProducerResponseEnDeCoder.start();
- newBrokerEnDeCoder = new NewBrokerEnDeCoder(encodingRegistry);
- newBrokerEnDeCoder.start();
- brokerConsumerReferenceEnDeCoder = new BrokerConsumerReferenceEnDeCoder(encodingRegistry);
- brokerConsumerReferenceEnDeCoder.start();
- brokerProducerReferenceEnDeCoder = new BrokerProducerReferenceEnDeCoder(encodingRegistry);
- brokerProducerReferenceEnDeCoder.start();
- newBrokerResponseEnDeCoder = new NewBrokerResponseEnDeCoder(encodingRegistry);
- newBrokerResponseEnDeCoder.start();
- brokersEnDeCoder = new BrokersEnDeCoder(encodingRegistry);
- brokersEnDeCoder.start();
- brokerEnDeCoder = new BrokerEnDeCoder(encodingRegistry);
- brokerEnDeCoder.start();
- endConsumersEnDeCoder = new EndConsumersEnDeCoder(encodingRegistry);
- endConsumersEnDeCoder.start();
- endProducersEnDeCoder = new EndProducersEnDeCoder(encodingRegistry);
- endProducersEnDeCoder.start();
- endpointReferenceEnDeCoder = new EndpointReferenceEnDeCoder(encodingRegistry);
- endpointReferenceEnDeCoder.start();
- referencePropertiesEnDeCoder = new ReferencePropertiesEnDeCoder(encodingRegistry);
- referencePropertiesEnDeCoder.start();
- brokerIDEnDeCoder = new BrokerIDEnDeCoder(encodingRegistry);
- brokerIDEnDeCoder.start();
- connectionOverrideEnDeCoder = new ConnectionOverrideEnDeCoder(encodingRegistry);
- connectionOverrideEnDeCoder.start();
- connectionOverrideResponseEnDeCoder = new ConnectionOverrideResponseEnDeCoder(encodingRegistry);
- connectionOverrideResponseEnDeCoder.start();
- newBrokerAckEnDeCoder = new NewBrokerAckEnDeCoder(encodingRegistry);
- newBrokerAckEnDeCoder.start();
- neighborBrokerConsumersEnDeCoder = new NeighborBrokerConsumersEnDeCoder(encodingRegistry);
- neighborBrokerConsumersEnDeCoder.start();
- removeBrokerEnDeCoder = new RemoveBrokerEnDeCoder(encodingRegistry);
- removeBrokerEnDeCoder.start();
- removedBrokerEnDeCoder = new RemovedBrokerEnDeCoder(encodingRegistry);
- removedBrokerEnDeCoder.start();
- neighborsEnDeCoder = new NeighborsEnDeCoder(encodingRegistry);
- neighborsEnDeCoder.start();
- replaceBrokerConnectionEnDeCoder = new ReplaceBrokerConnectionEnDeCoder(encodingRegistry);
- replaceBrokerConnectionEnDeCoder.start();
-
- String httpPort = System.getProperty("notification.httpPort");
- if (httpPort == null) {
- httpPort = DEFAULT_PORT;
- }
-
- ServletHost servletHost = new ExtensibleServletHost(registry.getExtensionPoint(ServletHostExtensionPoint.class));
-
- ntm = new NotificationTypeManagerImpl();
- ntm.setServletHost(servletHost);
- ntm.setEncodingRegistry(encodingRegistry);
- ntm.init();
-
- String localHost = null;
- try {
- localHost = InetAddress.getLocalHost().getCanonicalHostName();
- } catch(Exception e) {
- e.printStackTrace();
- localHost = "localhost";
- }
- String localBaseUrl = "http://" + localHost + ((httpPort != null) ? (":" + httpPort) : "");
-
AssemblyFactory assemblyFactory = new DefaultAssemblyFactory();
PolicyFactory policyFactory = new DefaultPolicyFactory();
DefaultNotificationBindingFactory bindingFactory = new DefaultNotificationBindingFactory();
@@ -183,41 +54,13 @@
processors.addArtifactProcessor(bindingProcessor);
NotificationBindingProviderFactory nbpf = new NotificationBindingProviderFactory(servletHost,
- ntm,
- encodingRegistry,
- localBaseUrl);
+ encodingRegistry);
ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
providerFactories.addProviderFactory(nbpf);
}
public void stop(ExtensionPointRegistry registry) {
- subscribeEnDeCoder.stop();
- consumerReferenceEnDeCoder.stop();
- endpointAddressEnDeCoder.stop();
- newConsumerEnDeCoder.stop();
- newProducerEnDeCoder.stop();
- newConsumerResponseEnDeCoder.stop();
- newProducerResponseEnDeCoder.stop();
- newBrokerEnDeCoder.stop();
- brokerConsumerReferenceEnDeCoder.stop();
- brokerProducerReferenceEnDeCoder.stop();
- newBrokerResponseEnDeCoder.stop();
- brokersEnDeCoder.stop();
- brokerEnDeCoder.stop();
- endConsumersEnDeCoder.stop();
- endProducersEnDeCoder.stop();
- endpointReferenceEnDeCoder.stop();
- referencePropertiesEnDeCoder.stop();
- brokerIDEnDeCoder.stop();
- connectionOverrideEnDeCoder.stop();
- connectionOverrideResponseEnDeCoder.stop();
- newBrokerAckEnDeCoder.stop();
- neighborBrokerConsumersEnDeCoder.stop();
- removeBrokerEnDeCoder.stop();
- removedBrokerEnDeCoder.stop();
- neighborsEnDeCoder.stop();
- replaceBrokerConnectionEnDeCoder.stop();
-
+ encodingRegistry.stop();
StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
processors.removeArtifactProcessor(bindingProcessor);
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/NotificationBindingProviderFactory.java Thu Sep 20 13:43:32 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.sca.binding.notification;
+import java.net.InetAddress;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
@@ -25,9 +26,36 @@
import java.util.List;
import java.util.Map;
+import org.apache.tuscany.sca.binding.notification.encoding.AbstractEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerConsumerReferenceEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerEnDeCoder;
import org.apache.tuscany.sca.binding.notification.encoding.BrokerID;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerIDEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokerProducerReferenceEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.BrokersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ConnectionOverrideResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ConsumerReferenceEnDeCoder;
import org.apache.tuscany.sca.binding.notification.encoding.EncodingRegistry;
+import org.apache.tuscany.sca.binding.notification.encoding.EndConsumersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.EndProducersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.EndpointAddressEnDeCoder;
import org.apache.tuscany.sca.binding.notification.encoding.EndpointReference;
+import org.apache.tuscany.sca.binding.notification.encoding.EndpointReferenceEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NeighborBrokerConsumersEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NeighborsEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerAckEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewBrokerResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewConsumerResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewProducerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.NewProducerResponseEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ReferencePropertiesEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.RemoveBrokerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.RemovedBrokerEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.ReplaceBrokerConnectionEnDeCoder;
+import org.apache.tuscany.sca.binding.notification.encoding.SubscribeEnDeCoder;
import org.apache.tuscany.sca.host.http.ServletHost;
import org.apache.tuscany.sca.provider.BindingProviderFactory;
import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
@@ -38,55 +66,48 @@
/**
* The runtime representaion of the notification reference binding
- *
+ *
* @version $Rev$ $Date$
*/
-public class NotificationBindingProviderFactory implements BindingProviderFactory<NotificationBinding>, NotificationBrokerManager {
+public class NotificationBindingProviderFactory implements BindingProviderFactory<NotificationBinding>,
+ NotificationBrokerManager {
+ private static final String DEFAULT_PORT = "8083";
private ServletHost servletHost;
- private NotificationTypeManager notificationTypeManager;
+ private NotificationTypeManagerImpl notificationTypeManager;
private EncodingRegistry encodingRegistry;
private String httpUrl;
private Map<URI, NotificationReferenceBindingProvider> referenceBindingProviders;
private Map<URI, NotificationServiceBindingProvider> serviceBindingProviders;
-
+
private static NotificationBindingProviderFactory factoryInstance = null;
-
- public NotificationBindingProviderFactory(ServletHost servletHost,
- NotificationTypeManager notificationTypeManager,
- EncodingRegistry encodingRegistry,
- String httpUrl) {
+
+ public NotificationBindingProviderFactory(ServletHost servletHost, EncodingRegistry encodingRegistry) {
this.servletHost = servletHost;
- this.notificationTypeManager = notificationTypeManager;
this.encodingRegistry = encodingRegistry;
- this.httpUrl = httpUrl;
this.referenceBindingProviders = new HashMap<URI, NotificationReferenceBindingProvider>();
this.serviceBindingProviders = new HashMap<URI, NotificationServiceBindingProvider>();
-
+
factoryInstance = this;
}
-
+
public Class<NotificationBinding> getModelType() {
return NotificationBinding.class;
}
-
+
public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
RuntimeComponentReference reference,
NotificationBinding binding) {
+ init();
URI notificationType = binding.getNotificationType();
if (!validReferenceBinding(binding)) {
throw new RuntimeException("Binding not valid");
}
NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);
if (referenceBindingProvider == null) {
- referenceBindingProvider = new NotificationReferenceBindingProvider(binding,
- component,
- reference,
- servletHost,
- notificationTypeManager,
- encodingRegistry,
- httpUrl,
- this);
+ referenceBindingProvider =
+ new NotificationReferenceBindingProvider(binding, component, reference, servletHost,
+ notificationTypeManager, encodingRegistry, httpUrl, this);
referenceBindingProviders.put(notificationType, referenceBindingProvider);
}
return referenceBindingProvider;
@@ -95,25 +116,21 @@
public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
RuntimeComponentService service,
NotificationBinding binding) {
+ init();
URI notificationType = binding.getNotificationType();
if (!validServiceBinding(binding)) {
throw new RuntimeException("Binding not valid");
}
NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
if (serviceBindingProvider == null) {
- serviceBindingProvider = new NotificationServiceBindingProvider(binding,
- component,
- service,
- servletHost,
- notificationTypeManager,
- encodingRegistry,
- httpUrl,
- this);
+ serviceBindingProvider =
+ new NotificationServiceBindingProvider(binding, component, service, servletHost,
+ notificationTypeManager, encodingRegistry, httpUrl, this);
serviceBindingProviders.put(notificationType, serviceBindingProvider);
}
return serviceBindingProvider;
}
-
+
private boolean validServiceBinding(NotificationBinding binding) {
URI notificationType = binding.getNotificationType();
NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);
@@ -122,7 +139,7 @@
}
return true;
}
-
+
private boolean validReferenceBinding(NotificationBinding binding) {
URI notificationType = binding.getNotificationType();
NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
@@ -131,25 +148,23 @@
}
return true;
}
-
+
private boolean validBinding(NotificationBinding binding1, NotificationBinding binding2) {
String binding1NtmAddress = binding1.getNtmAddress();
String binding2NtmAddress = binding2.getNtmAddress();
if (binding1NtmAddress == null && binding2NtmAddress == null) {
return true;
- }
- else if (binding1NtmAddress == null || binding2NtmAddress == null) {
+ } else if (binding1NtmAddress == null || binding2NtmAddress == null) {
return false;
- }
- else {
+ } else {
return binding1NtmAddress.equals(binding2NtmAddress);
}
}
-
+
/*
- * These methods are intended to be called by the binding providers' start methods. By the time this
- * happens, both referenceBindingProvider != null && serviceBindingProvider != null, if they are
- * ever going to be
+ * These methods are intended to be called by the binding providers' start
+ * methods. By the time this happens, both referenceBindingProvider != null &&
+ * serviceBindingProvider != null, if they are ever going to be
*/
public void serviceProviderStarted(URI notificationType,
NotificationServiceBindingProvider serviceBindingProvider,
@@ -157,26 +172,24 @@
NotificationReferenceBindingProvider referenceBindingProvider = referenceBindingProviders.get(notificationType);
if (referenceBindingProvider == null) {
serviceBindingProvider.deployConsumer();
- }
- else if (referenceBindingProvider.isStarted()) {
+ } else if (referenceBindingProvider.isStarted()) {
String brokerID = BrokerID.generate();
deployBroker(notificationType, serviceBindingProvider, referenceBindingProvider, brokerID, remoteNtmUrl);
}
}
-
+
public void referenceProviderStarted(URI notificationType,
NotificationReferenceBindingProvider referenceBindingProvider,
URL remoteNtmUrl) {
NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
if (serviceBindingProvider == null) {
referenceBindingProvider.deployProducer();
- }
- else if (serviceBindingProvider.isStarted()) {
+ } else if (serviceBindingProvider.isStarted()) {
String brokerID = BrokerID.generate();
deployBroker(notificationType, serviceBindingProvider, referenceBindingProvider, brokerID, remoteNtmUrl);
}
}
-
+
private void deployBroker(URI notificationType,
NotificationServiceBindingProvider serviceBindingProvider,
NotificationReferenceBindingProvider referenceBindingProvider,
@@ -186,22 +199,23 @@
URL producerUrl = referenceBindingProvider.getURL();
List<EndpointReference> consumerList = new ArrayList<EndpointReference>();
List<EndpointReference> producerList = new ArrayList<EndpointReference>();
- boolean firstBroker = notificationTypeManager.newBroker(notificationType,
- consumerUrl,
- producerUrl,
- brokerID,
- remoteNtmUrl,
- consumerList,
- producerList);
+ boolean firstBroker =
+ notificationTypeManager.newBroker(notificationType,
+ consumerUrl,
+ producerUrl,
+ brokerID,
+ remoteNtmUrl,
+ consumerList,
+ producerList);
if (firstBroker) {
serviceBindingProvider.deployBroker(brokerID, null, producerList);
referenceBindingProvider.deployBroker(brokerID, null, consumerList);
if (!consumerList.isEmpty() || !producerList.isEmpty()) {
notificationTypeManager.newBrokerAck(remoteNtmUrl);
}
- }
- else {
- // returned lists contain broker consumers and producers and are the same length
+ } else {
+ // returned lists contain broker consumers and producers and are the
+ // same length
int index = consumerList.size() - 1;
// establish connection with picked broker
EndpointReference brokerConsumerEPR = consumerList.get(index);
@@ -210,7 +224,7 @@
referenceBindingProvider.deployBroker(brokerID, brokerConsumerEPR, null);
}
}
-
+
public void replaceConsumersBrokerConnection(URI notificationType, EndpointReference chosenBrokerProducerEpr) {
NotificationServiceBindingProvider serviceBindingProvider = serviceBindingProviders.get(notificationType);
if (serviceBindingProvider == null) {
@@ -218,16 +232,103 @@
}
serviceBindingProvider.replaceBrokerConnection(chosenBrokerProducerEpr);
}
-
+
public static void removeBroker(URI notificationType) {
if (factoryInstance == null) {
throw new RuntimeException("Missing factory instance");
}
- NotificationReferenceBindingProvider referenceBindingProvider = factoryInstance.referenceBindingProviders.get(notificationType);
- NotificationServiceBindingProvider serviceBindingProvider = factoryInstance.serviceBindingProviders.get(notificationType);
+ NotificationReferenceBindingProvider referenceBindingProvider =
+ factoryInstance.referenceBindingProviders.get(notificationType);
+ NotificationServiceBindingProvider serviceBindingProvider =
+ factoryInstance.serviceBindingProviders.get(notificationType);
if (referenceBindingProvider == null || serviceBindingProvider == null) {
throw new RuntimeException("Not a broker for [" + notificationType + "]");
}
referenceBindingProvider.undeployBroker(serviceBindingProvider.getURL());
}
+
+ private String getBaseURI() {
+ if (httpUrl == null) {
+ String httpPort = System.getProperty("notification.httpPort");
+ if (httpPort == null) {
+ httpPort = DEFAULT_PORT;
+ }
+ String localHost = null;
+ try {
+ localHost = InetAddress.getLocalHost().getCanonicalHostName();
+ } catch (Exception e) {
+ e.printStackTrace();
+ localHost = "localhost";
+ }
+ httpUrl = "http://" + localHost + ((httpPort != null) ? (":" + httpPort) : "");
+ }
+ return httpUrl;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void init() {
+ if (notificationTypeManager == null) {
+ AbstractEnDeCoder subscribeEnDeCoder = new SubscribeEnDeCoder(encodingRegistry);
+ subscribeEnDeCoder.start();
+ AbstractEnDeCoder consumerReferenceEnDeCoder = new ConsumerReferenceEnDeCoder(encodingRegistry);
+ consumerReferenceEnDeCoder.start();
+ AbstractEnDeCoder endpointAddressEnDeCoder = new EndpointAddressEnDeCoder(encodingRegistry);
+ endpointAddressEnDeCoder.start();
+ AbstractEnDeCoder newConsumerEnDeCoder = new NewConsumerEnDeCoder(encodingRegistry);
+ newConsumerEnDeCoder.start();
+ AbstractEnDeCoder newProducerEnDeCoder = new NewProducerEnDeCoder(encodingRegistry);
+ newProducerEnDeCoder.start();
+ AbstractEnDeCoder newConsumerResponseEnDeCoder = new NewConsumerResponseEnDeCoder(encodingRegistry);
+ newConsumerResponseEnDeCoder.start();
+ AbstractEnDeCoder newProducerResponseEnDeCoder = new NewProducerResponseEnDeCoder(encodingRegistry);
+ newProducerResponseEnDeCoder.start();
+ AbstractEnDeCoder newBrokerEnDeCoder = new NewBrokerEnDeCoder(encodingRegistry);
+ newBrokerEnDeCoder.start();
+ AbstractEnDeCoder brokerConsumerReferenceEnDeCoder = new BrokerConsumerReferenceEnDeCoder(encodingRegistry);
+ brokerConsumerReferenceEnDeCoder.start();
+ AbstractEnDeCoder brokerProducerReferenceEnDeCoder = new BrokerProducerReferenceEnDeCoder(encodingRegistry);
+ brokerProducerReferenceEnDeCoder.start();
+ AbstractEnDeCoder newBrokerResponseEnDeCoder = new NewBrokerResponseEnDeCoder(encodingRegistry);
+ newBrokerResponseEnDeCoder.start();
+ AbstractEnDeCoder brokersEnDeCoder = new BrokersEnDeCoder(encodingRegistry);
+ brokersEnDeCoder.start();
+ AbstractEnDeCoder brokerEnDeCoder = new BrokerEnDeCoder(encodingRegistry);
+ brokerEnDeCoder.start();
+ AbstractEnDeCoder endConsumersEnDeCoder = new EndConsumersEnDeCoder(encodingRegistry);
+ endConsumersEnDeCoder.start();
+ AbstractEnDeCoder endProducersEnDeCoder = new EndProducersEnDeCoder(encodingRegistry);
+ endProducersEnDeCoder.start();
+ AbstractEnDeCoder endpointReferenceEnDeCoder = new EndpointReferenceEnDeCoder(encodingRegistry);
+ endpointReferenceEnDeCoder.start();
+ AbstractEnDeCoder referencePropertiesEnDeCoder = new ReferencePropertiesEnDeCoder(encodingRegistry);
+ referencePropertiesEnDeCoder.start();
+ AbstractEnDeCoder brokerIDEnDeCoder = new BrokerIDEnDeCoder(encodingRegistry);
+ brokerIDEnDeCoder.start();
+ AbstractEnDeCoder connectionOverrideEnDeCoder = new ConnectionOverrideEnDeCoder(encodingRegistry);
+ connectionOverrideEnDeCoder.start();
+ AbstractEnDeCoder connectionOverrideResponseEnDeCoder =
+ new ConnectionOverrideResponseEnDeCoder(encodingRegistry);
+ connectionOverrideResponseEnDeCoder.start();
+ AbstractEnDeCoder newBrokerAckEnDeCoder = new NewBrokerAckEnDeCoder(encodingRegistry);
+ newBrokerAckEnDeCoder.start();
+ AbstractEnDeCoder neighborBrokerConsumersEnDeCoder = new NeighborBrokerConsumersEnDeCoder(encodingRegistry);
+ neighborBrokerConsumersEnDeCoder.start();
+ AbstractEnDeCoder removeBrokerEnDeCoder = new RemoveBrokerEnDeCoder(encodingRegistry);
+ removeBrokerEnDeCoder.start();
+ AbstractEnDeCoder removedBrokerEnDeCoder = new RemovedBrokerEnDeCoder(encodingRegistry);
+ removedBrokerEnDeCoder.start();
+ AbstractEnDeCoder neighborsEnDeCoder = new NeighborsEnDeCoder(encodingRegistry);
+ neighborsEnDeCoder.start();
+ AbstractEnDeCoder replaceBrokerConnectionEnDeCoder = new ReplaceBrokerConnectionEnDeCoder(encodingRegistry);
+ replaceBrokerConnectionEnDeCoder.start();
+
+ notificationTypeManager = new NotificationTypeManagerImpl();
+ notificationTypeManager.setServletHost(servletHost);
+ notificationTypeManager.setEncodingRegistry(encodingRegistry);
+ notificationTypeManager.init();
+
+ getBaseURI();
+ }
+ }
+
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/AbstractEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -23,41 +23,28 @@
/**
* @version $Rev$ $Date$
*/
-public abstract class AbstractEnDeCoder<E extends EncodingObject> implements EnDeCoder<E> {
+public abstract class AbstractEnDeCoder<E extends EncodingObject> implements
+ EnDeCoder<E> {
+
+ protected EncodingRegistry registry;
+
+ protected AbstractEnDeCoder(EncodingRegistry registry) {
+
+ this.registry = registry;
+ }
+
+ public void start() {
+ Class<E> encodingType = getEncodingObjectType();
+ QName encodingQName = getEncodingObjectQName();
+
+ registry.registerEnDeCoder(encodingType, encodingQName, this);
+ }
+
+ public void stop() {
+ Class<E> encodingType = getEncodingObjectType();
+ QName encodingQName = getEncodingObjectQName();
+
+ registry.unregisterEnDeCoder(encodingType, encodingQName);
+ }
- protected EncodingRegistry registry;
-
- protected AbstractEnDeCoder(EncodingRegistry registry) {
-
- this.registry = registry;
- }
-
- public void start() {
- Class<E> encodingType = getEncodingObjectType();
- QName encodingQName = getEncodingObjectQName();
-
- registry.registerEnDeCoder(encodingType, encodingQName, this);
- }
-
- public void stop() {
- Class<E> encodingType = getEncodingObjectType();
- QName encodingQName = getEncodingObjectQName();
-
- registry.unregisterEnDeCoder(encodingType, encodingQName);
- }
-
- /**
- * Gets the qualified name of the XML fragment for the Encoding
- * object.
- *
- * @return Qualified name of the XML fragment.
- */
- protected abstract QName getEncodingObjectQName();
-
- /**
- * Returns the type of the encoding object.
- *
- * @return Encoding object type.
- */
- protected abstract Class<E> getEncodingObjectType();
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerConsumerReferenceEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,13 +32,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<BrokerConsumerReference> getEncodingObjectType() {
+
+ public Class<BrokerConsumerReference> getEncodingObjectType() {
return BrokerConsumerReference.class;
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,14 +32,14 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<Broker> getEncodingObjectType() {
+
+ public Class<Broker> getEncodingObjectType() {
return Broker.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerIDEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -77,14 +77,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<BrokerID> getEncodingObjectType() {
+
+ public Class<BrokerID> getEncodingObjectType() {
return BrokerID.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokerProducerReferenceEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,13 +32,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<BrokerProducerReference> getEncodingObjectType() {
+
+ public Class<BrokerProducerReference> getEncodingObjectType() {
return BrokerProducerReference.class;
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/BrokersEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -75,14 +75,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<Brokers> getEncodingObjectType() {
+
+ public Class<Brokers> getEncodingObjectType() {
return Brokers.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -69,14 +69,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<ConnectionOverride> getEncodingObjectType() {
+
+ public Class<ConnectionOverride> getEncodingObjectType() {
return ConnectionOverride.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConnectionOverrideResponseEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -63,14 +63,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<ConnectionOverrideResponse> getEncodingObjectType() {
+
+ public Class<ConnectionOverrideResponse> getEncodingObjectType() {
return ConnectionOverrideResponse.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ConsumerReferenceEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,13 +32,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<ConsumerReference> getEncodingObjectType() {
+
+ public Class<ConsumerReference> getEncodingObjectType() {
return ConsumerReference.class;
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/DefaultEncodingRegistry.java Thu Sep 20 13:43:32 2007
@@ -70,4 +70,9 @@
}
return decoder.decode(reader);
}
+
+ public void stop() {
+ encoderRegistry.clear();
+ decoderRegistry.clear();
+ }
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.sca.binding.notification.encoding;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
@@ -43,4 +44,19 @@
* @throws EncodingException In case of any encoding error.
*/
E decode(XMLStreamReader reader) throws EncodingException;
+
+ /**
+ * Gets the qualified name of the XML fragment for the Encoding
+ * object.
+ *
+ * @return Qualified name of the XML fragment.
+ */
+ QName getEncodingObjectQName();
+
+ /**
+ * Returns the type of the encoding object.
+ *
+ * @return Encoding object type.
+ */
+ Class<E> getEncodingObjectType();
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndConsumersEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -35,13 +35,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<EndConsumers> getEncodingObjectType() {
+
+ public Class<EndConsumers> getEncodingObjectType() {
return EndConsumers.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndProducersEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -35,13 +35,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<EndProducers> getEncodingObjectType() {
+
+ public Class<EndProducers> getEncodingObjectType() {
return EndProducers.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointAddressEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -77,14 +77,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<EndpointAddress> getEncodingObjectType() {
+
+ public Class<EndpointAddress> getEncodingObjectType() {
return EndpointAddress.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/EndpointReferenceEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -87,14 +87,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<EndpointReference> getEncodingObjectType() {
+
+ public Class<EndpointReference> getEncodingObjectType() {
return EndpointReference.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborBrokerConsumersEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -35,13 +35,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NeighborBrokerConsumers> getEncodingObjectType() {
+
+ public Class<NeighborBrokerConsumers> getEncodingObjectType() {
return NeighborBrokerConsumers.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NeighborsEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -75,14 +75,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<Neighbors> getEncodingObjectType() {
+
+ public Class<Neighbors> getEncodingObjectType() {
return Neighbors.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerAckEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -63,14 +63,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewBrokerAck> getEncodingObjectType() {
+
+ public Class<NewBrokerAck> getEncodingObjectType() {
return NewBrokerAck.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,14 +32,14 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewBroker> getEncodingObjectType() {
+
+ public Class<NewBroker> getEncodingObjectType() {
return NewBroker.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewBrokerResponseEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -105,14 +105,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewBrokerResponse> getEncodingObjectType() {
+
+ public Class<NewBrokerResponse> getEncodingObjectType() {
return NewBrokerResponse.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,13 +32,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewConsumer> getEncodingObjectType() {
+
+ public Class<NewConsumer> getEncodingObjectType() {
return NewConsumer.class;
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewConsumerResponseEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -35,13 +35,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewConsumerResponse> getEncodingObjectType() {
+
+ public Class<NewConsumerResponse> getEncodingObjectType() {
return NewConsumerResponse.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,13 +32,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewProducer> getEncodingObjectType() {
+
+ public Class<NewProducer> getEncodingObjectType() {
return NewProducer.class;
}
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/NewProducerResponseEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -35,17 +35,17 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<NewProducerResponse> getEncodingObjectType() {
+
+ public Class<NewProducerResponse> getEncodingObjectType() {
return NewProducerResponse.class;
}
- @Override
+ @Override
protected void encodeSequenceTypeAttribute(NewProducerResponse encodingObject, XMLStreamWriter writer) throws EncodingException {
try {
writer.writeAttribute(Constants.ConsumerSequenceType, encodingObject.getSequenceType());
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/ReferencePropertiesEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -73,14 +73,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<ReferenceProperties> getEncodingObjectType() {
+
+ public Class<ReferenceProperties> getEncodingObjectType() {
return ReferenceProperties.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemoveBrokerEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -87,14 +87,14 @@
}
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<RemoveBroker> getEncodingObjectType() {
+
+ public Class<RemoveBroker> getEncodingObjectType() {
return RemoveBroker.class;
}
Modified: incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java?rev=577910&r1=577909&r2=577910&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java (original)
+++ incubator/tuscany/java/sca/modules/binding-notification/src/main/java/org/apache/tuscany/sca/binding/notification/encoding/RemovedBrokerEnDeCoder.java Thu Sep 20 13:43:32 2007
@@ -32,13 +32,13 @@
super(registry);
}
- @Override
- protected QName getEncodingObjectQName() {
+
+ public QName getEncodingObjectQName() {
return QNAME;
}
- @Override
- protected Class<RemovedBroker> getEncodingObjectType() {
+
+ public Class<RemovedBroker> getEncodingObjectType() {
return RemovedBroker.class;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org