You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/09/05 09:25:39 UTC
svn commit: r992717 - in
/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources:
META-INF/maven/ archetype-resources/ archetype-resources/META-INF/
archetype-resources/src/main/java/
archetype-resources/src/main/java/runtime/ archetype-resou...
Author: antelder
Date: Sun Sep 5 07:25:39 2010
New Revision: 992717
URL: http://svn.apache.org/viewvc?rev=992717&view=rev
Log:
Get the binding archetype working
Added:
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd
Removed:
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__bindingName__.xsd
Modified:
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/pom.xml
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/FooBindingTestCase.java
tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/META-INF/maven/archetype-metadata.xml Sun Sep 5 07:25:39 2010
@@ -33,25 +33,25 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*.*</include>
</includes>
</fileSet>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**/*.*</include>
</includes>
</fileSet>
- <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>MANIFEST.MF</include>
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/META-INF/MANIFEST.MF Sun Sep 5 07:25:39 2010
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA Foo Binding
+Bundle-Name: Apache Tuscany SCA ${bindingName} Binding
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: 2.0.0
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA Foo Binding
+Bundle-Description: Apache Tuscany SCA ${bindingName} Binding
Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0",
org.apache.tuscany.sca.core;version="2.0.0",
org.apache.tuscany.sca.interfacedef;version="2.0.0",
org.apache.tuscany.sca.invocation;version="2.0.0",
org.apache.tuscany.sca.provider;version="2.0.0",
org.apache.tuscany.sca.runtime;version="2.0.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.binding.foo
+Bundle-SymbolicName: org.apache.tuscany.sca.binding.${artifactId}
Bundle-DocURL: http://www.apache.org/
Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/pom.xml?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/pom.xml Sun Sep 5 07:25:39 2010
@@ -1,22 +1,23 @@
<?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>
+<!--
+ * 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>
@@ -24,9 +25,11 @@
<version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>${artifactId}</artifactId>
+
+ <artifactId>binding-${artifactId}</artifactId>
<groupId>${groupId}</groupId>
- <name>Apache Tuscany SCA Foo Binding Runtime</name>
+ <version>${version}</version>
+ <name>Apache Tuscany SCA ${bindingName} Binding Extension</name>
<dependencies>
@@ -34,12 +37,14 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-http</artifactId>
<version>2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -78,6 +83,4 @@
</dependency>
</dependencies>
- <version>${version}</version>
-
</project>
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__Binding.java Sun Sep 5 07:25:39 2010
@@ -19,84 +19,34 @@
* specific language governing permissions and limitations
* under the License.
*/
-package ${package}.binding.foo;
+package ${package};
import javax.xml.namespace.QName;
-import ${package}.assembly.Binding;
-import ${package}.assembly.OperationSelector;
-import ${package}.assembly.WireFormat;
+import org.apache.tuscany.sca.provider.BaseBindingImpl;
/**
- * Represents a binding to an Foo service.
+ * Represents a binding to a ${bindingName} service.
*/
-public class FooBinding implements Binding {
+public class ${bindingName}Binding extends BaseBindingImpl {
- QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.foo");
+ public static final QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.${artifactId}");
- private String name;
- private String uri;
- private String bindingType;
+ private String someAttr;
- public String getBindingType() {
- return bindingType;
- }
-
- public void setBindingType(String bindingType) {
- this.bindingType = bindingType;
- }
-
- public String getName() {
- return name;
- }
-
- public String getURI() {
- return uri;
- }
-
- public void setURI(String uri) {
- this.uri = uri;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public Object clone() throws CloneNotSupportedException {
- return super.clone();
- }
-
- public boolean isUnresolved() {
- return false;
- }
-
- public void setUnresolved(boolean arg0) {
+ public ${bindingName}Binding() {
}
public QName getType() {
return TYPE;
}
- public WireFormat getRequestWireFormat() {
- return null;
- }
-
- public void setRequestWireFormat(WireFormat wireFormat) {
- }
-
- public WireFormat getResponseWireFormat() {
- return null;
- }
-
- public void setResponseWireFormat(WireFormat wireFormat) {
+ public String getSomeAttr() {
+ return someAttr;
}
-
- public OperationSelector getOperationSelector() {
- return null;
+
+ public void setSomeAttr(String someAttr) {
+ this.someAttr = someAttr;
}
-
- public void setOperationSelector(OperationSelector operationSelector) {
- }
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/__bindingName__BindingFactory.java Sun Sep 5 07:25:39 2010
@@ -20,16 +20,16 @@
* under the License.
*/
-package ${package}.binding.foo;
+package ${package};
/**
- * Factory implementation to create Foo Models
+ * Factory implementation to create ${bindingName} Models
*/
-public class FooBindingFactory {
+public class ${bindingName}BindingFactory {
- public FooBinding createFooBinding() {
- return new FooBinding();
+ public ${bindingName}Binding create${bindingName}Binding() {
+ return new ${bindingName}Binding();
}
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__BindingProviderFactory.java Sun Sep 5 07:25:39 2010
@@ -20,31 +20,31 @@
* under the License.
*/
-package ${package}.binding.foo.runtime;
+package ${package}.runtime;
-import ${package}.binding.foo.FooBinding;
-import ${package}.core.ExtensionPointRegistry;
-import ${package}.provider.BindingProviderFactory;
-import ${package}.provider.ReferenceBindingProvider;
-import ${package}.provider.ServiceBindingProvider;
-import ${package}.runtime.RuntimeEndpoint;
-import ${package}.runtime.RuntimeEndpointReference;
+import ${package}.${bindingName}Binding;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
+import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-public class FooBindingProviderFactory implements BindingProviderFactory<FooBinding> {
+public class ${bindingName}BindingProviderFactory implements BindingProviderFactory<${bindingName}Binding> {
- public FooBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
+ public ${bindingName}BindingProviderFactory(ExtensionPointRegistry extensionPoints) {
}
- public Class<FooBinding> getModelType() {
- return FooBinding.class;
+ public Class<${bindingName}Binding> getModelType() {
+ return ${bindingName}Binding.class;
}
public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpoint) {
- return new FooReferenceBindingProvider(endpoint);
+ return new ${bindingName}ReferenceBindingProvider(endpoint);
}
public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {
- return new FooServiceBindingProvider(endpoint);
+ return new ${bindingName}ServiceBindingProvider(endpoint);
}
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceBindingProvider.java Sun Sep 5 07:25:39 2010
@@ -20,25 +20,25 @@
* under the License.
*/
-package ${package}.binding.foo.runtime;
+package ${package}.runtime;
-import ${package}.assembly.EndpointReference;
-import ${package}.interfacedef.InterfaceContract;
-import ${package}.interfacedef.Operation;
-import ${package}.invocation.Invoker;
-import ${package}.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.assembly.EndpointReference;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-public class FooReferenceBindingProvider implements ReferenceBindingProvider {
+public class ${bindingName}ReferenceBindingProvider implements ReferenceBindingProvider {
private EndpointReference endpoint;
private InterfaceContract contract;
- public FooReferenceBindingProvider(EndpointReference endpoint) {
+ public ${bindingName}ReferenceBindingProvider(EndpointReference endpoint) {
this.endpoint = endpoint;
}
public Invoker createInvoker(Operation operation) {
- return new FooReferenceInvoker(operation, endpoint);
+ return new ${bindingName}ReferenceInvoker(operation, endpoint);
}
public void start() {
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ReferenceInvoker.java Sun Sep 5 07:25:39 2010
@@ -20,19 +20,19 @@
* under the License.
*/
-package ${package}.binding.foo.runtime;
+package ${package}.runtime;
-import ${package}.assembly.EndpointReference;
-import ${package}.interfacedef.Operation;
-import ${package}.invocation.Invoker;
-import ${package}.invocation.Message;
+import org.apache.tuscany.sca.assembly.EndpointReference;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
-public class FooReferenceInvoker implements Invoker {
+public class ${bindingName}ReferenceInvoker implements Invoker {
protected Operation operation;
protected EndpointReference endpoint;
- public FooReferenceInvoker(Operation operation, EndpointReference endpoint) {
+ public ${bindingName}ReferenceInvoker(Operation operation, EndpointReference endpoint) {
this.operation = operation;
this.endpoint = endpoint;
}
@@ -50,7 +50,7 @@ public class FooReferenceInvoker impleme
public Message doInvoke(Message msg) {
// Add some code here to make an invocation over the foo binding protocol
// For this sample we'll just get it from the static stash
- FooServiceInvoker fi = FooStash.getService(endpoint.getBinding().getURI());
+ ${bindingName}ServiceInvoker fi = ${bindingName}Stash.getService(endpoint.getBinding().getURI());
return fi.invokeService(msg);
}
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceBindingProvider.java Sun Sep 5 07:25:39 2010
@@ -20,19 +20,19 @@
* under the License.
*/
-package ${package}.binding.foo.runtime;
+package ${package}.runtime;
-import ${package}.binding.foo.FooBinding;
-import ${package}.interfacedef.InterfaceContract;
-import ${package}.provider.ServiceBindingProvider;
-import ${package}.runtime.RuntimeEndpoint;
+import ${package}.${bindingName}Binding;
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-public class FooServiceBindingProvider implements ServiceBindingProvider {
+public class ${bindingName}ServiceBindingProvider implements ServiceBindingProvider {
private RuntimeEndpoint endpoint;
private InterfaceContract contract;
- public FooServiceBindingProvider(RuntimeEndpoint endpoint) {
+ public ${bindingName}ServiceBindingProvider(RuntimeEndpoint endpoint) {
this.endpoint = endpoint;
}
@@ -40,13 +40,13 @@ public class FooServiceBindingProvider i
// add some code here to start the service
// For this sample we'll just share it in a static
- FooStash.addService(endpoint.getBinding().getURI(), new FooServiceInvoker(endpoint));
+ ${bindingName}Stash.addService(endpoint.getBinding().getURI(), new ${bindingName}ServiceInvoker(endpoint));
- System.out.println("bindingType=" + ((FooBinding)endpoint.getBinding()).getBindingType());
+ System.out.println("someAttr=" + ((${bindingName}Binding)endpoint.getBinding()).getSomeAttr());
}
public void stop() {
- FooStash.removeService(endpoint.getBinding().getURI());
+ ${bindingName}Stash.removeService(endpoint.getBinding().getURI());
}
public InterfaceContract getBindingInterfaceContract() {
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__ServiceInvoker.java Sun Sep 5 07:25:39 2010
@@ -20,16 +20,16 @@
* under the License.
*/
-package ${package}.binding.foo.runtime;
+package ${package}.runtime;
-import ${package}.invocation.Message;
-import ${package}.runtime.RuntimeEndpoint;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-public class FooServiceInvoker {
+public class ${bindingName}ServiceInvoker {
private RuntimeEndpoint wire;
- public FooServiceInvoker(RuntimeEndpoint wire) {
+ public ${bindingName}ServiceInvoker(RuntimeEndpoint wire) {
this.wire = wire;
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/java/runtime/__bindingName__Stash.java Sun Sep 5 07:25:39 2010
@@ -20,7 +20,7 @@
* under the License.
*/
-package ${package}.binding.foo.runtime;
+package ${package}.runtime;
import java.util.HashMap;
import java.util.Map;
@@ -28,15 +28,15 @@ import java.util.Map;
/**
* Simplistic static Map to share service endpoints with references
*/
-public class FooStash {
+public class ${bindingName}Stash {
- private static Map<String, FooServiceInvoker> services = new HashMap<String, FooServiceInvoker>();
+ private static Map<String, ${bindingName}ServiceInvoker> services = new HashMap<String, ${bindingName}ServiceInvoker>();
- public static void addService(String uri, FooServiceInvoker fooServiceInvoker) {
- services.put(uri, fooServiceInvoker);
+ public static void addService(String uri, ${bindingName}ServiceInvoker ${bindingName}ServiceInvoker) {
+ services.put(uri, ${bindingName}ServiceInvoker);
}
- public static FooServiceInvoker getService(String uri) {
+ public static ${bindingName}ServiceInvoker getService(String uri) {
return services.get(uri);
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/__package__.__bindingName__BindingFactory Sun Sep 5 07:25:39 2010
@@ -1,20 +1,20 @@
-# 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.
-
-# Implementation class for model factory
-org.apache.tuscany.sca.binding.foo.FooBindingFactory
+# 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.
+
+# Implementation class for model factory
+${package}.${bindingName}BindingFactory
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Sun Sep 5 07:25:39 2010
@@ -16,5 +16,5 @@
# under the License.
# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.foo,model=${package}.${bindingName}Binding,factory={package}.${bindingName}BindingFactory
+org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.${artifactId},model=${package}.${bindingName}Binding,factory=${package}.${bindingName}BindingFactory
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema Sun Sep 5 07:25:39 2010
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
#
-binding-${bindingName}.xsd
+binding-${artifactId}.xsd
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory Sun Sep 5 07:25:39 2010
@@ -16,5 +16,5 @@
# under the License.
# Implementation class for the binding extension
-{package}.runtime.${bindingName}BindingProviderFactory;model={package}.${bindingName}Binding
+${package}.runtime.${bindingName}BindingProviderFactory;model=${package}.${bindingName}Binding
Added: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd?rev=992717&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd (added)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/main/resources/binding-__artifactId__.xsd Sun Sep 5 07:25:39 2010
@@ -0,0 +1,37 @@
+#set( $bindingNameLC = ${bindingName} )<?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.
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
+ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
+ elementFormDefault="qualified">
+
+ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" />
+
+ <element name="binding.${artifactId}" type="t:${bindingName}Binding" substitutionGroup="sca:binding"/>
+
+ <complexType name="${bindingName}Binding">
+ <complexContent>
+ <extension base="sca:Binding">
+ <attribute name="someAttr" type="string" use="optional"/>
+ </extension>
+ </complexContent>
+ </complexType>
+</schema>
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/FooBindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/FooBindingTestCase.java?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/FooBindingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/java/test/FooBindingTestCase.java Sun Sep 5 07:25:39 2010
@@ -24,9 +24,8 @@ package test;
import helloworld.HelloWorldService;
import junit.framework.Assert;
-import ${package}.http.jetty.JettyServer;
-import ${package}.node.Node;
-import ${package}.node.NodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,7 +42,6 @@ public class FooBindingTestCase {
@BeforeClass
public static void init() throws Exception {
- JettyServer.portDefault = 8085;
node = NodeFactory.newInstance().createNode("helloworld.composite").start();
}
Modified: tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite?rev=992717&r1=992716&r2=992717&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite (original)
+++ tuscany/sca-java-2.x/trunk/archetypes/binding/src/main/resources/archetype-resources/src/test/resources/helloworld.composite Sun Sep 5 07:25:39 2010
@@ -25,14 +25,14 @@
<component name="HelloWorldComponent">
<implementation.java class="helloworld.HelloWorldImpl"/>
<service name="HelloWorldService" >
- <tuscany:binding.${bindingName} bindingType="ws" />
+ <tuscany:binding.${artifactId} someAttr="bla" />
</service>
</component>
<component name="HelloWorldClient">
<implementation.java class="helloworld.HelloWorldClient"/>
<reference name="ref" >
- <tuscany:binding.${bindingName} uri="HelloWorldComponent/HelloWorldService"/>
+ <tuscany:binding.${artifactId} uri="HelloWorldComponent/HelloWorldService"/>
</reference>
</component>