Author: ramkumar
Date: Sat Dec 13 03:05:18 2008
New Revision: 726189
URL: http://svn.apache.org/viewvc?rev=726189&view=rev
Log:
Tag for 1.4RC2
Added:
tuscany/tags/java/sca/1.4RC2/ (props changed)
- copied from r725591, tuscany/branches/sca-java-1.4/
tuscany/tags/java/sca/1.4RC2/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r725682,
tuscany/branches/sca-java-1.4/demos/bigbank-account/src/main/resources/META-INF/sca-contribution.xml
tuscany/tags/java/sca/1.4RC2/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
- copied unchanged from r725682,
tuscany/branches/sca-java-1.4/demos/bigbank/src/main/resources/META-INF/sca-contribution.xml
tuscany/tags/java/sca/1.4RC2/distribution/
- copied from r725961, tuscany/branches/sca-java-1.4/distribution/
tuscany/tags/java/sca/1.4RC2/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
- copied unchanged from r725636,
tuscany/branches/sca-java-1.4/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/
- copied from r725750, tuscany/branches/sca-java-1.4/modules/assembly-xsd/
tuscany/tags/java/sca/1.4RC2/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/
- copied from r726072,
tuscany/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/
tuscany/tags/java/sca/1.4RC2/modules/implementation-bpel-ode/pom.xml
- copied unchanged from r725683,
tuscany/branches/sca-java-1.4/modules/implementation-bpel-ode/pom.xml
tuscany/tags/java/sca/1.4RC2/samples/helloworld-bpel-ws/build.xml
- copied unchanged from r725682,
tuscany/branches/sca-java-1.4/samples/helloworld-bpel-ws/build.xml
tuscany/tags/java/sca/1.4RC2/samples/helloworld-bpel/build.xml
- copied unchanged from r725682,
tuscany/branches/sca-java-1.4/samples/helloworld-bpel/build.xml
tuscany/tags/java/sca/1.4RC2/samples/photo-gallery/build.xml
- copied unchanged from r725682,
tuscany/branches/sca-java-1.4/samples/photo-gallery/build.xml
tuscany/tags/java/sca/1.4RC2/samples/zipcode-jaxws/
- copied from r725943,
tuscany/branches/sca-java-1.4/samples/zipcode-jaxws/
Modified:
tuscany/tags/java/sca/1.4RC2/distribution/bundle/pom.xml
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-core.xsd
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca.xsd
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
tuscany/tags/java/sca/1.4RC2/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
tuscany/tags/java/sca/1.4RC2/samples/domain-management/src/main/java/manager/WireComponents.java
tuscany/tags/java/sca/1.4RC2/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
Propchange: tuscany/tags/java/sca/1.4RC2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Dec 13 03:05:18 2008
@@ -0,0 +1,19 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
+Maven_Ant_Builder.launch
+
+
Propchange: tuscany/tags/java/sca/1.4RC2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Dec 13 03:05:18 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3:671193
+/tuscany/branches/sca-java-1.x:724111-724120
Modified: tuscany/tags/java/sca/1.4RC2/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/distribution/bundle/pom.xml?rev=726189&r1=725961&r2=726189&view=diff
==============================================================================
--- tuscany/tags/java/sca/1.4RC2/distribution/bundle/pom.xml (original)
+++ tuscany/tags/java/sca/1.4RC2/distribution/bundle/pom.xml Sat Dec 13
03:05:18 2008
@@ -132,12 +132,12 @@
<artifactId>tuscany-binding-sca-axis2</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-sca-corba</artifactId>
<version>${pom.version}</version>
</dependency>
- <!-- dependency>
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-sca-jms</artifactId>
<version>${pom.version}</version>
Modified:
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-contributions.xsd?rev=726189&r1=725750&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
(original)
+++
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
Sat Dec 13 03:05:18 2008
@@ -7,19 +7,19 @@
elementFormDefault="qualified">
<include schemaLocation="sca-core.xsd"/>
- <import namespace="http://tuscany.apache.org/xmlns/sca/1.0";
schemaLocation="tuscany-sca-contributions.xsd"/>
-
+ <include schemaLocation="tuscany-sca-contributions.xsd"/>
+
<element name="contribution" type="sca:ContributionType"/>
<complexType name="ContributionType">
<sequence>
<choice minOccurs="0" maxOccurs="unbounded">
- <element name="deployable" type="sca:DeployableType"
minOccurs="0" maxOccurs="unbounded"/>
+ <element name="deployable" type="sca:DeployableType"
minOccurs="0" maxOccurs="unbounded"/>
<element name="import" type="sca:ImportType"/>
<element name="export" type="sca:ExportType"/>
- <element name="import.java" type="t:ImportJavaType"/>
- <element name="export.java" type="t:ExportJavaType"/>
- <element name="import.resource" type="t:ImportResourceType"/>
- <element name="export.resource" type="t:ExportResourceType"/>
+ <element name="import.java" type="sca:ImportJavaType"/>
+ <element name="export.java" type="sca:ExportJavaType"/>
+ <element name="import.resource"
type="sca:ImportResourceType"/>
+ <element name="export.resource"
type="sca:ExportResourceType"/>
</choice>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
Modified:
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-core.xsd
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-core.xsd?rev=726189&r1=725750&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-core.xsd
(original)
+++
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca-core.xsd
Sat Dec 13 03:05:18 2008
@@ -154,7 +154,7 @@
maxOccurs="unbounded" />
</sequence>
<attribute name="uri" type="anyURI" use="optional"/>
- <attribute name="name" type="QName" use="optional"/>
+ <attribute name="name" type="sca:listOfAnyURIs" use="optional"/>
<attribute name="requires" type="sca:listOfQNames" use="optional"/>
<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
</complexType>
Modified:
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca.xsd
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca.xsd?rev=726189&r1=725750&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca.xsd
(original)
+++
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/sca.xsd
Sat Dec 13 03:05:18 2008
@@ -18,7 +18,7 @@
<include schemaLocation="sca-contributions.xsd"/>
- <include schemaLocation="sca-contributions.xsd"/>
+ <include schemaLocation="tuscany-sca-contributions.xsd"/>
<include schemaLocation="sca-definitions.xsd"/>
<include schemaLocation="sca-policy.xsd"/>
Modified:
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd?rev=726189&r1=725750&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
(original)
+++
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd
Sat Dec 13 03:05:18 2008
@@ -18,12 +18,12 @@
* under the License.
-->
<schema xmlns="http://www.w3.org/2001/XMLSchema";
- targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0";
+ targetNamespace="http://www.osoa.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";
elementFormDefault="qualified">
- <element name="import.resource" type="t:ImportResourceType"/>
+ <element name="import.resource" type="sca:ImportResourceType"/>
<complexType name="ImportResourceType">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
@@ -34,7 +34,7 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
- <element name="export.resource" type="t:ExportResourceType"/>
+ <element name="export.resource" type="sca:ExportResourceType"/>
<complexType name="ExportResourceType">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
@@ -44,7 +44,7 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
- <element name="import.java" type="t:ImportJavaType"/>
+ <element name="import.java" type="sca:ImportJavaType"/>
<complexType name="ImportJavaType">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
@@ -55,7 +55,7 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
- <element name="export.java" type="t:ExportJavaType"/>
+ <element name="export.java" type="sca:ExportJavaType"/>
<complexType name="ExportJavaType">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
Modified:
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd?rev=726189&r1=725750&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
(original)
+++
tuscany/tags/java/sca/1.4RC2/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
Sat Dec 13 03:05:18 2008
@@ -46,6 +46,4 @@
<include schemaLocation="tuscany-sca-implementation-widget.xsd"/>
<include schemaLocation="tuscany-sca-implementation-xquery.xsd"/>
- <include schemaLocation="tuscany-sca-contributions.xsd"/>
-
</schema>
\ No newline at end of file
Modified:
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml?rev=726189&r1=725591&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
(original)
+++
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
Sat Dec 13 03:05:18 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:CalculatorA"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml?rev=726189&r1=725591&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
(original)
+++
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
Sat Dec 13 03:05:18 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:CalculatorB"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml?rev=726189&r1=725591&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
(original)
+++
tuscany/tags/java/sca/1.4RC2/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
Sat Dec 13 03:05:18 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:CalculatorC"/>
</contribution>
\ No newline at end of file
Modified:
tuscany/tags/java/sca/1.4RC2/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml?rev=726189&r1=725591&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/tags/java/sca/1.4RC2/samples/callback-ws-service/src/main/resources/META-INF/sca-contribution.xml
Sat Dec 13 03:05:18 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://callbackws";
xmlns:cbws="http://callbackws";>
<deployable composite="cbws:callbackws" />
</contribution>
Modified:
tuscany/tags/java/sca/1.4RC2/samples/domain-management/src/main/java/manager/WireComponents.java
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/samples/domain-management/src/main/java/manager/WireComponents.java?rev=726189&r1=725591&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/samples/domain-management/src/main/java/manager/WireComponents.java
(original)
+++
tuscany/tags/java/sca/1.4RC2/samples/domain-management/src/main/java/manager/WireComponents.java
Sat Dec 13 03:05:18 2008
@@ -157,12 +157,6 @@
Workspace workspace = workspaceFactory.createWorkspace();
workspace.setModelResolver(new ExtensibleModelResolver(workspace,
modelResolvers, modelFactories));
- // Read the sample store contribution
- URI storeURI = URI.create("store");
- URL storeURL = new
File("./target/sample-domain-management-store.jar").toURI().toURL();
- Contribution storeContribution = contributionProcessor.read(null,
storeURI, storeURL);
- workspace.getContributions().add(storeContribution);
-
// Read the sample assets contribution
URI assetsURI = URI.create("assets");
URL assetsURL = new
File("./target/sample-domain-management-assets.jar").toURI().toURL();
@@ -174,6 +168,12 @@
URL clientURL = new
File("./target/sample-domain-management-client.jar").toURI().toURL();
Contribution clientContribution = contributionProcessor.read(null,
clientURI, clientURL);
workspace.getContributions().add(clientContribution);
+
+ // Read the sample store contribution
+ URI storeURI = URI.create("store");
+ URL storeURL = new
File("./target/sample-domain-management-store.jar").toURI().toURL();
+ Contribution storeContribution = contributionProcessor.read(null,
storeURI, storeURL);
+ workspace.getContributions().add(storeContribution);
// Build the contribution dependencies
Set<Contribution> resolved = new HashSet<Contribution>();
Modified:
tuscany/tags/java/sca/1.4RC2/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/tags/java/sca/1.4RC2/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml?rev=726189&r1=725591&r2=726189&view=diff
==============================================================================
---
tuscany/tags/java/sca/1.4RC2/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
(original)
+++
tuscany/tags/java/sca/1.4RC2/samples/implementation-composite/src/main/resources/META-INF/sca-contribution.xml
Sat Dec 13 03:05:18 2008
@@ -19,7 +19,6 @@
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://sample";
xmlns:sample="http://sample";>
<deployable composite="sample:OuterComposite"/>
</contribution>
\ No newline at end of file
