diff options
11 files changed, 110 insertions, 62 deletions
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema index 403b16f035..63937b16e6 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema +++ b/java/sca/modules/assembly-xsd/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. # -sca-10/tuscany-sca.xsd -#sca-11/tuscany-sca-1.1.xsd
\ No newline at end of file +sca-10/tuscany-sca.xsd
\ No newline at end of file diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd index 788571de7b..e357e212d3 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-dwr.xsd @@ -18,12 +18,12 @@ * under the License. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> <element name="binding.dwr" type="t:DWRBinding"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd index bd36a8f52f..19cd511ad3 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-http.xsd @@ -18,12 +18,12 @@ * under the License. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> <element name="binding.http" type="t:HTTPBinding"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd index bacfdda781..292ccfef34 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-jsonrpc.xsd @@ -18,12 +18,12 @@ * under the License. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> <element name="binding.jsonrpc" type="t:JSONRPCBinding"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd index 26be6feae5..b008494c0f 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-binding-rmi.xsd @@ -18,12 +18,12 @@ * under the License. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> <element name="binding.rmi" type="t:RMIBinding"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd index 1b5c8aece2..1b8bca1e30 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1-implementation-node.xsd @@ -18,12 +18,12 @@ * under the License. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" + xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" elementFormDefault="qualified"> - <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/> + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-core-1.1-schema-200803.xsd"/> <element name="implementation.node" type="t:NodeImplementation"/> diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd index 15567c06dd..27e8760bb5 100644 --- a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/tuscany-sca-1.1.xsd @@ -24,12 +24,10 @@ <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200712" schemaLocation="sca-1.1-schema-200803.xsd"/> - <include schemaLocation="tuscany-sca-binding-dwr.xsd"/> - <include schemaLocation="tuscany-sca-binding-http.xsd"/> - <include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/> - <include schemaLocation="tuscany-sca-binding-jms.xsd"/> - <include schemaLocation="tuscany-sca-binding-rmi.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/> + <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/> - <include schemaLocation="tuscany-sca-implementation-node.xsd"/> - <include schemaLocation="tuscany-sca-implementation-resource.xsd"/> + <include schemaLocation="tuscany-sca-1.1-implementation-node.xsd"/> </schema>
\ No newline at end of file diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd new file mode 100644 index 0000000000..79af5e9363 --- /dev/null +++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-11/wsdli.xsd @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"--> +<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ --> +<!-- + W3C XML Schema defined in the Web Services Description (WSDL) + Version 2.0 specification + http://www.w3.org/TR/wsdl20 + + Copyright (c) 2004 World Wide Web Consortium, + + (Massachusetts Institute of Technology, European Research Consortium for + Informatics and Mathematics, Keio University). All Rights Reserved. This + work is distributed under the W3C(r) Software License [1] in the hope that + it will be useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 +--> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified"> + + <xs:attribute name="wsdlLocation"> + <xs:annotation> + <xs:documentation> + This attribute can be used to provide some hints on where + additional WSDL information for a given namespace can be + found in order to help with QName resolution + </xs:documentation> + </xs:annotation> + <xs:simpleType> + <xs:list itemType="xs:anyURI"/> + </xs:simpleType> + </xs:attribute> + +</xs:schema> diff --git a/java/sca/modules/binding-dwr/.externalToolBuilders/Maven_Ant_Builder.launch b/java/sca/modules/binding-dwr/.externalToolBuilders/Maven_Ant_Builder.launch index dfaca68595..98e0c46b82 100644 --- a/java/sca/modules/binding-dwr/.externalToolBuilders/Maven_Ant_Builder.launch +++ b/java/sca/modules/binding-dwr/.externalToolBuilders/Maven_Ant_Builder.launch @@ -1,25 +1,24 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/tuscany-binding-dwr"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tuscany-binding-dwr"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version='1.0'?><launchConfigurationWorkingSet editPageId='org.eclipse.ui.resourceWorkingSetPage' factoryID='org.eclipse.ui.internal.WorkingSetFactory' label='workingSet' name='workingSet'><item factoryID='org.eclipse.ui.internal.model.ResourceFactory' path='tuscany-binding-dwr' type='4'/></launchConfigurationWorkingSet>}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/maven-eclipse.xml"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
-</launchConfiguration>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> + <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,clean"/> + <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/> + <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> + <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="tuscany-binding-dwr"/> + <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project}/maven-eclipse.xml"/> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project}"/> + <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/> + <booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/> + <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<?xml version='1.0'?><launchConfigurationWorkingSet editPageId='org.eclipse.ui.resourceWorkingSetPage' factoryID='org.eclipse.ui.internal.WorkingSetFactory' label='workingSet' name='workingSet'><item factoryID='org.eclipse.ui.internal.model.ResourceFactory' path='tuscany-binding-dwr' type='4'/></launchConfigurationWorkingSet>}"/> + <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> + <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/> + <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/> + <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/> + <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> + <listEntry value="1"/> + </listAttribute> + <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> + <listEntry value="/tuscany-binding-dwr/maven-eclipse.xml"/> + </listAttribute> +</launchConfiguration>
\ No newline at end of file diff --git a/java/sca/modules/binding-dwr/maven-eclipse.xml b/java/sca/modules/binding-dwr/maven-eclipse.xml index 8e4db6c1d8..97a145fd24 100644 --- a/java/sca/modules/binding-dwr/maven-eclipse.xml +++ b/java/sca/modules/binding-dwr/maven-eclipse.xml @@ -1,8 +1,8 @@ -<project default="copy-resources">
- <target name="init"/>
- <target name="copy-resources" depends="init">
- <copy todir="target/classes/META-INF" filtering="true">
- <fileset dir="." includes="LICENSE|NOTICE|MANIFEST.MF"/>
- </copy>
- </target>
+<project default="copy-resources"> + <target name="init"/> + <target name="copy-resources" depends="init"> + <copy todir="target/classes/META-INF" filtering="true"> + <fileset dir="." includes="LICENSE|NOTICE|MANIFEST.MF"/> + </copy> + </target> </project>
\ No newline at end of file diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index 84da2011b8..9698315b0c 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -103,7 +103,25 @@ <profile> <id>eclipse</id> <build> - + <!--plugins> + <plugin> + <groupId>org.apache.tuscany.maven.plugins</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>1.0</version> + <extensions>true</extensions> + <executions> + <execution> + <id>generate-pde</id> + <phase>generate-resources</phase> + <goals> + <goal>eclipse</goal> + </goals> + <configuration> + </configuration> + </execution> + </executions> + </plugin> + </plugins--> <defaultGoal>org.apache.tuscany.maven.plugins:maven-bundle-plugin:eclipse</defaultGoal> </build> |