You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/10/27 00:45:08 UTC
svn commit: r830026 [4/6] - in /tuscany/branches/sca-java-1.x: ./
demos/alert-aggregator-webapp/ distribution/bundle/ distribution/manifest/
distribution/src/main/assembly/ distribution/src/main/release/
distribution/src/main/release/bin/ distribution/...
Modified: tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java Mon Oct 26 23:44:59 2009
@@ -39,11 +39,13 @@
import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
import org.apache.tuscany.sca.implementation.spring.SpringImplementation;
import org.apache.tuscany.sca.implementation.spring.introspect.SpringXMLComponentTypeLoader;
+import org.apache.tuscany.sca.implementation.spring.invocation.ConfigurationPropertiesExtensionPoint;
+import org.apache.tuscany.sca.implementation.spring.invocation.DefaultConfigurationPropertiesExtensionPoint;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
+import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
import org.apache.tuscany.sca.policy.PolicyFactory;
/**
@@ -63,9 +65,11 @@
private JavaInterfaceFactory javaFactory;
private PolicyFactory policyFactory;
private PolicyAttachPointProcessor policyProcessor;
+ private ConfigurationPropertiesExtensionPoint configProperties;
private Monitor monitor;
-
+
private ModelFactoryExtensionPoint factories;
+ private boolean multipleContextSupport;
public SpringImplementationProcessor(ExtensionPointRegistry extensionPoints, Monitor monitor) {
this.factories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
@@ -73,6 +77,12 @@
this.javaFactory = factories.getFactory(JavaInterfaceFactory.class);
this.policyFactory = factories.getFactory(PolicyFactory.class);
this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
+
+ this.configProperties = extensionPoints.getExtensionPoint(ConfigurationPropertiesExtensionPoint.class);
+ if (configProperties == null) {
+ configProperties = new DefaultConfigurationPropertiesExtensionPoint();
+ }
+ this.multipleContextSupport = configProperties.isMultipleContextSupported();
this.monitor = monitor;
}
@@ -197,7 +207,7 @@
/* Load the Spring component type by reading the Spring application context */
SpringXMLComponentTypeLoader springLoader =
- new SpringXMLComponentTypeLoader(factories, assemblyFactory, javaFactory, policyFactory);
+ new SpringXMLComponentTypeLoader(factories, assemblyFactory, javaFactory, policyFactory, multipleContextSupport);
try {
// Load the Spring Implementation information from its application context file...
springLoader.load(springImplementation, resolver);
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/store.html Mon Oct 26 23:44:59 2009
@@ -1,127 +1,127 @@
-<!--
- * 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.
--->
-<html>
-<head>
-<title>Store</TITLE>
-
-<!-- one js include per sca component -->
-<script type="text/javascript" src="store.js"></script>
-
-<script language="JavaScript">
-
- //@Reference
- var catalog = new tuscany.sca.Reference("Catalog");
-
- //@Reference
+<!--
+ * 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.
+-->
+<html>
+<head>
+<title>Store</TITLE>
+
+<!-- one js include per sca component -->
+<script type="text/javascript" src="store.js"></script>
+
+<script language="JavaScript">
+
+ //@Reference
+ var catalog = new tuscany.sca.Reference("Catalog");
+
+ //@Reference
var shoppingCart = new tuscany.sca.Reference("ShoppingCart");
//@Property
- var locale = Property("locale");
-
- function catalog_getResponse(items,exception) {
- if(exception){
- alert(exception.message);
- return;
- }
- var catalog = "";
- for (var i=0; i<items.length; i++)
- catalog += '<input name="items" type="checkbox" value="' +
- items[i] + '">' + items[i]+ ' <br>';
- document.getElementById('catalog').innerHTML=catalog;
- }
-
- function shoppingCart_getResponse(feed) {
- if (feed != null) {
- var entries = feed.getElementsByTagName("entry");
- var list = "";
- for (var i=0; i<entries.length; i++) {
- var item = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
- list += item + ' <br>';
- }
- document.getElementById("shoppingCart").innerHTML = list;
- document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;
- }
- }
- function shoppingCart_postResponse(entry) {
- shoppingCart.get("", shoppingCart_getResponse);
- }
-
-
- function addToCart() {
- var items = document.catalogForm.items;
- var j = 0;
- for (var i=0; i<items.length; i++)
- if (items[i].checked) {
- var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'
- shoppingCart.post(entry, shoppingCart_postResponse);
- items[i].checked = false;
- }
- }
- function checkoutCart() {
- document.getElementById('store').innerHTML='<h2>' +
- 'Thanks for Shopping With Us!</h2>'+
- '<h2>Your Order</h2>'+
- '<form name="orderForm" action="/ufs/store.html">'+
- document.getElementById('shoppingCart').innerHTML+
- '<br>'+
- document.getElementById('total').innerHTML+
- '<br>'+
- '<br>'+
- '<input type="submit" value="Continue Shopping">'+
- '</form>';
- shoppingCart.del("", null);
- }
- function deleteCart() {
- shoppingCart.del("", null);
- document.getElementById('shoppingCart').innerHTML = "";
- document.getElementById('total').innerHTML = "";
- }
-
- //alert(locale);
- catalog.get(catalog_getResponse);
- shoppingCart.get("", shoppingCart_getResponse);
-</script>
-
-</head>
-
-<body>
-<h1>Store</h1>
- <div id="store">
- <h2>Catalog</h2>
- <form name="catalogForm">
- <div id="catalog" ></div>
- <br>
- <input type="button" onClick="addToCart()" value="Add to Cart">
- </form>
-
- <br>
-
- <h2>Your Shopping Cart</h2>
- <form name="shoppingCartForm">
- <div id="shoppingCart"></div>
- <br>
- <div id="total"></div>
- <br>
- <input type="button" onClick="checkoutCart()" value="Checkout">
- <input type="button" onClick="deleteCart()" value="Empty">
- <a href="../ShoppingCart/">(feed)</a>
- </form>
- </div>
-</body>
+ var locale = Property("locale");
+
+ function catalog_getResponse(items,exception) {
+ if(exception){
+ alert(exception.message);
+ return;
+ }
+ var catalog = "";
+ for (var i=0; i<items.length; i++)
+ catalog += '<input name="items" type="checkbox" value="' +
+ items[i] + '">' + items[i]+ ' <br>';
+ document.getElementById('catalog').innerHTML=catalog;
+ }
+
+ function shoppingCart_getResponse(feed) {
+ if (feed != null) {
+ var entries = feed.getElementsByTagName("entry");
+ var list = "";
+ for (var i=0; i<entries.length; i++) {
+ var item = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
+ list += item + ' <br>';
+ }
+ document.getElementById("shoppingCart").innerHTML = list;
+ document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;
+ }
+ }
+ function shoppingCart_postResponse(entry) {
+ shoppingCart.get("", shoppingCart_getResponse);
+ }
+
+
+ function addToCart() {
+ var items = document.catalogForm.items;
+ var j = 0;
+ for (var i=0; i<items.length; i++)
+ if (items[i].checked) {
+ var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'
+ shoppingCart.post(entry, shoppingCart_postResponse);
+ items[i].checked = false;
+ }
+ }
+ function checkoutCart() {
+ document.getElementById('store').innerHTML='<h2>' +
+ 'Thanks for Shopping With Us!</h2>'+
+ '<h2>Your Order</h2>'+
+ '<form name="orderForm" action="/ufs/store.html">'+
+ document.getElementById('shoppingCart').innerHTML+
+ '<br>'+
+ document.getElementById('total').innerHTML+
+ '<br>'+
+ '<br>'+
+ '<input type="submit" value="Continue Shopping">'+
+ '</form>';
+ shoppingCart.del("", null);
+ }
+ function deleteCart() {
+ shoppingCart.del("", null);
+ document.getElementById('shoppingCart').innerHTML = "";
+ document.getElementById('total').innerHTML = "";
+ }
+
+ //alert(locale);
+ catalog.get(catalog_getResponse);
+ shoppingCart.get("", shoppingCart_getResponse);
+</script>
+
+</head>
+
+<body>
+<h1>Store</h1>
+ <div id="store">
+ <h2>Catalog</h2>
+ <form name="catalogForm">
+ <div id="catalog" ></div>
+ <br>
+ <input type="button" onClick="addToCart()" value="Add to Cart">
+ </form>
+
+ <br>
+
+ <h2>Your Shopping Cart</h2>
+ <form name="shoppingCartForm">
+ <div id="shoppingCart"></div>
+ <br>
+ <div id="total"></div>
+ <br>
+ <input type="button" onClick="checkoutCart()" value="Checkout">
+ <input type="button" onClick="deleteCart()" value="Empty">
+ <a href="../ShoppingCart/">(feed)</a>
+ </form>
+ </div>
+</body>
</html>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/storeJS.html Mon Oct 26 23:44:59 2009
@@ -1,152 +1,152 @@
-<!--
- * 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.
--->
-<html>
-<head>
-<title>Store</TITLE>
-
-<!-- one js include per sca component -->
-<!-- For Atom, the Tuscany JavaScript client includes the model for Atom.
- Using this JavaScript model, users can use syntax such as:
- item += "name=" + entry.getName() + ", price=" + entry.getContent()
- rather than
- item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
- -->
-<script type="text/javascript" src="storeJS.js"></script>
-
-<script language="JavaScript">
-
- //@Reference
- var catalog = new tuscany.sca.Reference("Catalog");
-
- //@Reference
+<!--
+ * 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.
+-->
+<html>
+<head>
+<title>Store</TITLE>
+
+<!-- one js include per sca component -->
+<!-- For Atom, the Tuscany JavaScript client includes the model for Atom.
+ Using this JavaScript model, users can use syntax such as:
+ item += "name=" + entry.getName() + ", price=" + entry.getContent()
+ rather than
+ item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
+ -->
+<script type="text/javascript" src="storeJS.js"></script>
+
+<script language="JavaScript">
+
+ //@Reference
+ var catalog = new tuscany.sca.Reference("Catalog");
+
+ //@Reference
var shoppingCart = new tuscany.sca.Reference("ShoppingCart");
//@Property
- var locale = Property("locale");
-
- function catalog_getResponse(items,exception) {
- if(exception){
- alert(exception.message);
- return;
- }
- var catalog = "";
- for (var i=0; i<items.length; i++)
- catalog += '<input name="items" type="checkbox" value="' +
- items[i] + '">' + items[i]+ ' <br>';
- document.getElementById('catalog').innerHTML=catalog;
- }
-
- function shoppingCart_getResponse(feedDoc) {
- // var xmlString = new XMLSerializer().serializeToString(feedDoc);
- // alert("shoppingCart_getResponse feed xml=" + xmlString);
- var feed = new Feed( feedDoc );
-
- if (feed != null) {
- // var entries = feed.getElementsByTagName("entry");
- var entries = feed.getEntries();
- var list = "";
- for (var i=0; i<entries.length; i++) {
- // var item = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
- var item = entries[ i ].getContent().getText();
- list += item + ' <br>';
- }
- document.getElementById("shoppingCart").innerHTML = list;
- // document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;
- var text = feed.getSubtitle().getText();
- document.getElementById('total').innerHTML = text;
- }
- }
-
- function shoppingCart_postResponse(entry) {
- shoppingCart.get("", shoppingCart_getResponse);
- }
-
- function addToCart() {
- var items = document.catalogForm.items;
- var j = 0;
- for (var i=0; i<items.length; i++)
- if (items[i].checked) {
- var entry = new Entry( "cart-item" );
- entry.setContent( items[i].value );
- var entryXML = entry.toXML();
- var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'
- shoppingCart.post(entry, shoppingCart_postResponse);
- items[i].checked = false;
- }
- }
-
- function checkoutCart() {
- document.getElementById('store').innerHTML='<h2>' +
- 'Thanks for Shopping With Us!</h2>'+
- '<h2>Your Order</h2>'+
- '<form name="orderForm" action="/ufs/store.html">'+
- document.getElementById('shoppingCart').innerHTML+
- '<br>'+
- document.getElementById('total').innerHTML+
- '<br>'+
- '<br>'+
- '<input type="submit" value="Continue Shopping">'+
- '</form>';
- shoppingCart.del("", null);
- }
- function deleteCart() {
- shoppingCart.del("", null);
- document.getElementById('shoppingCart').innerHTML = "";
- document.getElementById('total').innerHTML = "";
- }
- function testFeedtoXML() {
- if(exception){
- alert(exception.message);
- return;
- }
- document.getElementById('results').innerHTML = text;
- }
-
- //alert(locale);
- catalog.get(catalog_getResponse);
- shoppingCart.get("", shoppingCart_getResponse);
-</script>
-
-</head>
-
-<body>
-<h1>Store</h1>
- <div id="store">
- <h2>Catalog</h2>
- <form name="catalogForm">
- <div id="catalog" ></div>
- <br>
- <input type="button" onClick="addToCart()" value="Add to Cart">
- </form>
-
- <br>
-
- <h2>Your Shopping Cart</h2>
- <form name="shoppingCartForm">
- <div id="shoppingCart"></div>
- <br>
- <div id="total"></div>
- <br>
- <input type="button" onClick="checkoutCart()" value="Checkout">
- <input type="button" onClick="deleteCart()" value="Empty">
- <a href="../ShoppingCart/">(feed)</a>
- </form>
- </div>
-</body>
+ var locale = Property("locale");
+
+ function catalog_getResponse(items,exception) {
+ if(exception){
+ alert(exception.message);
+ return;
+ }
+ var catalog = "";
+ for (var i=0; i<items.length; i++)
+ catalog += '<input name="items" type="checkbox" value="' +
+ items[i] + '">' + items[i]+ ' <br>';
+ document.getElementById('catalog').innerHTML=catalog;
+ }
+
+ function shoppingCart_getResponse(feedDoc) {
+ // var xmlString = new XMLSerializer().serializeToString(feedDoc);
+ // alert("shoppingCart_getResponse feed xml=" + xmlString);
+ var feed = new Feed( feedDoc );
+
+ if (feed != null) {
+ // var entries = feed.getElementsByTagName("entry");
+ var entries = feed.getEntries();
+ var list = "";
+ for (var i=0; i<entries.length; i++) {
+ // var item = entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
+ var item = entries[ i ].getContent().getText();
+ list += item + ' <br>';
+ }
+ document.getElementById("shoppingCart").innerHTML = list;
+ // document.getElementById('total').innerHTML = feed.getElementsByTagName("subtitle")[0].firstChild.nodeValue;
+ var text = feed.getSubtitle().getText();
+ document.getElementById('total').innerHTML = text;
+ }
+ }
+
+ function shoppingCart_postResponse(entry) {
+ shoppingCart.get("", shoppingCart_getResponse);
+ }
+
+ function addToCart() {
+ var items = document.catalogForm.items;
+ var j = 0;
+ for (var i=0; i<items.length; i++)
+ if (items[i].checked) {
+ var entry = new Entry( "cart-item" );
+ entry.setContent( items[i].value );
+ var entryXML = entry.toXML();
+ var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>cart-item</title><content type="text">'+items[i].value+'</content></entry>'
+ shoppingCart.post(entry, shoppingCart_postResponse);
+ items[i].checked = false;
+ }
+ }
+
+ function checkoutCart() {
+ document.getElementById('store').innerHTML='<h2>' +
+ 'Thanks for Shopping With Us!</h2>'+
+ '<h2>Your Order</h2>'+
+ '<form name="orderForm" action="/ufs/store.html">'+
+ document.getElementById('shoppingCart').innerHTML+
+ '<br>'+
+ document.getElementById('total').innerHTML+
+ '<br>'+
+ '<br>'+
+ '<input type="submit" value="Continue Shopping">'+
+ '</form>';
+ shoppingCart.del("", null);
+ }
+ function deleteCart() {
+ shoppingCart.del("", null);
+ document.getElementById('shoppingCart').innerHTML = "";
+ document.getElementById('total').innerHTML = "";
+ }
+ function testFeedtoXML() {
+ if(exception){
+ alert(exception.message);
+ return;
+ }
+ document.getElementById('results').innerHTML = text;
+ }
+
+ //alert(locale);
+ catalog.get(catalog_getResponse);
+ shoppingCart.get("", shoppingCart_getResponse);
+</script>
+
+</head>
+
+<body>
+<h1>Store</h1>
+ <div id="store">
+ <h2>Catalog</h2>
+ <form name="catalogForm">
+ <div id="catalog" ></div>
+ <br>
+ <input type="button" onClick="addToCart()" value="Add to Cart">
+ </form>
+
+ <br>
+
+ <h2>Your Shopping Cart</h2>
+ <form name="shoppingCartForm">
+ <div id="shoppingCart"></div>
+ <br>
+ <div id="total"></div>
+ <br>
+ <input type="button" onClick="checkoutCart()" value="Checkout">
+ <input type="button" onClick="deleteCart()" value="Empty">
+ <a href="../ShoppingCart/">(feed)</a>
+ </form>
+ </div>
+</body>
</html>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/content/unitTests.html Mon Oct 26 23:44:59 2009
@@ -1,250 +1,250 @@
-<!--
- * 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.
--->
-<html>
-<head>
-<title>Atom JavaScript Client Unit Tests</title>
-
-<!-- Include Tuscany JavaScript client model for Atom.
- Using this JavaScript model, users can use syntax such as:
- item += "name=" + entry.getName() + ", price=" + entry.getContent()
- rather than
- item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
- -->
-<script type="text/javascript" src="atomModel.js"></script>
-
-<script language="JavaScript">
-
- function testUritoXML() {
- var test = new Uri( "http://example.org/edit/first-post.atom" );
- var text = text.toXML();
- alert( "Uri=" + text );
- }
-
- function testEmailtoXML() {
- var test = new Email( "john.doe@ibm.com" );
- var text = test.toXML();
- alert( "Email=" + text );
- }
-
- function testIdtoXML() {
- var test = new Id( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );
- var text = test.toXML();
- alert( "Id=" + text );
- }
-
- function testLogotoXML() {
- var test = new Logo( "goofyGraphic.png" );
- var text = test.toXML();
- alert( "Logo=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testTexttoXML() {
- var test = new Text( "This is ordinary text." );
- var text = test.toXML();
- alert( "Text=" + text );
- var test = new Text( "This is <b>HTML</b> text.", "html" );
- var text = test.toXML( "supertext" );
- alert( "Text=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testPersontoXML() {
- var test = new Person( "John Doe", "john.doe@ibm.com" );
- var text = test.toXML();
- alert( "Person=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testGeneratortoXML() {
- var test = new Generator( "Power Station", "http://www.powerstation.com" );
- var text = test.toXML();
- alert( "Generator=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testCategorytoXML() {
- var test = new Category( "CategoryXYZ", "http://www.site.com/?category=CategoryXYZ" );
- var text = test.toXML();
- alert( "Category=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testLinktoXML() {
- var test = new Link( "http://example.org/edit/first-post.atom", "edit" );
- var text = test.toXML();
- alert( "Link=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testEntrytoXML() {
- // <?xml version="1.0"?>
- // <entry xmlns="http://www.w3.org/2005/Atom">
- // <title>Atom-Powered Robots Run Amok</title>
- // <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
- // <updated>2003-12-13T18:30:02Z</updated>
- // <author><name>John Doe</name></author>
- // <content>Some text.</content>
- // <link rel="edit" href="http://example.org/edit/first-post.atom"/>
- // </entry>
-
- var entry = new Entry();
- entry.setNamespace( "http://www.w3.org/2005/Atom" );
- entry.setTitle( "Atom-Powered Robots Run Amok" );
- entry.setId( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );
- entry.setUpdated( "2003-12-13T18:30:02Z" );
- entry.setContent( "Some text." );
- entry.addAuthor( new Person( "John Doe" ) );
- entry.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));
- entry.addContributor( new Person( "Sam Ruby" ));
- entry.addContributor( new Person( "Joe Gregorio" ));
- entry.addLink( new Link( "http://example.org/edit/first-post.atom", "edit" ));
- var text = entry.toXML();
-
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function testFeedtoXML() {
- // <feed xmlns="http://www.w3.org/2005/Atom">
- // <title type="text">dive into mark</title>
- // <subtitle type="html">A <em>lot</em> of effort went into making this effortless </subtitle>
- // <updated>2005-07-31T12:29:29Z</updated>
- // <id>tag:example.org,2003:3</id>
- // <link rel="alternate" type="text/html" hreflang="en" href="http://example.org/"/>
- // <link rel="self" type="application/atom+xml" href="http://example.org/feed.atom"/>
- // <rights>Copyright (c) 2003, Mark Pilgrim</rights>
- // <generator uri="http://www.example.com/" version="1.0">Example Toolkit</generator>
- // <entry>
- // <title>Atom draft-07 snapshot</title>
- // <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>
- // <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>
- // <id>tag:example.org,2003:3.2397</id>
- // <updated>2005-07-31T12:29:29Z</updated>
- // <published>2003-12-13T08:29:29-04:00</published>
- // <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>
- // <contributor><name>Sam Ruby</name></contributor>
- // <contributor><name>Joe Gregorio</name></contributor>
- // <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/">
- // <div xmlns="http://www.w3.org/1999/xhtml">
- // <p><i>[Update: The Atom draft is finished.]</i></p>
- // </div>
- // </content>
- // </entry>
- // <entry>
- // <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>
- // <category term="triathlons"/>
- // <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>
- // <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>
- // <published>2008-09-05T14:09:32-05:00</published>
- // <updated>2008-09-06T08:49:12-05:00</updated>
- // <summary type='html'>
- // <a href='http://www.io.com/~beckerdo/triathlons/besthills.html'><img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'></a>
- // A description and Google maps of the best running and biking hills in Austin, Texas.
- // </summary>
- // </entry>
- // </feed>
-
- var feed = new Feed( "Dive into Mark" );
- feed.setSubtitle( new Text( "A <em>lot</em> of effort went into making this effortless", "html" ));
- feed.setUpdated( "2005-07-31T12:29:29Z" );
- feed.setId( "tag:example.org,2003:3" );
- var link = new Link( "http://example.org", "alternate" );
- link.setMimeType( "text/html" );
- link.setHRefLang( "en" );
- feed.addLink( link );
- feed.addLink( new Link( "http://example.org/feed.atom", "self" ));
- feed.setRights( "Copyright (c) 2003, Mark Pilgrim" );
- feed.setGenerator( new Generator( "Example Toolkit", "http://www.example.com/" ));
- feed.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));
- feed.addContributor( new Person( "Sam Ruby" ));
- feed.addContributor( new Person( "Joe Gregorio" ));
- // <entry>
- // <title>Atom draft-07 snapshot</title>
- // <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>
- // <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>
- // <id>tag:example.org,2003:3.2397</id>
- // <updated>2005-07-31T12:29:29Z</updated>
- // <published>2003-12-13T08:29:29-04:00</published>
- // <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>
- // <contributor><name>Sam Ruby</name></contributor>
- // <contributor><name>Joe Gregorio</name></contributor>
- // <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/">
- // <div xmlns="http://www.w3.org/1999/xhtml">
- // <p><i>[Update: The Atom draft is finished.]</i></p>
- // </div>
- // </content>
- // </entry>
- // <entry>
- // <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>
- // <category term="triathlons"/>
- // <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>
- // <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>
- // <published>2008-09-05T14:09:32-05:00</published>
- // <updated>2008-09-06T08:49:12-05:00</updated>
- // <summary type='html'>
- // <a href='http://www.io.com/~beckerdo/triathlons/besthills.html'><img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'></a>
- // A description and Google maps of the best running and biking hills in Austin, Texas.
- // </summary>
- // </entry>
- // </feed>
- var entry = new Entry( "Dan Becker's Triathlon Site - Best Hills In Austin" );
- entry.addCategory( new Category( "running" ));
- entry.addCategory( new Category( "triathlons" ));
- entry.setId( "tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html" );
- entry.addLink( new Link ( "http://www.io.com/~beckerdo/triathlons/besthills.html" ));
- entry.setPublished( "2008-09-05T14:09:32-05:00" );
- entry.setUpdated( "2008-09-06T08:49:12-05:00" );
- entry.setSummary( new Text (
- "<a href='http://www.io.com/~beckerdo/triathlons/besthills.html'><img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'></a>\n" +
- "A description and Google maps of the best running and biking hills in Austin, Texas.", "html" ));
- feed.addEntry( entry );
-
- var text = feed.toXML();
- alert( "Feed xml=" + text );
- document.getElementById('results').innerHTML = removeBrackets( text );
- }
-
- function removeBrackets( input ) {
- input = input.replace( /</g, "<" ); // replaceAll
- input = input.replace( />/g, ">" ); // replaceAll
- return input;
- }
-</script>
-</head>
-
-<body>
-<h1>Atom JavaScript Client Unit Tests</h1>
-<p>This document tests the serialization and deserialization of the Atom JavaScript client.
- <h2>Model to XML Tests</h2>
- <input type="button" onClick="testUritoXML()" value="Uri to XML"><br>
- <input type="button" onClick="testEmailtoXML()" value="Email to XML"><br>
- <input type="button" onClick="testIdtoXML()" value="Id to XML"><br>
- <input type="button" onClick="testLogotoXML()" value="Logo to XML"><br>
- <input type="button" onClick="testTexttoXML()" value="Text to XML"><br>
- <input type="button" onClick="testPersontoXML()" value="Person to XML"><br>
- <input type="button" onClick="testGeneratortoXML()" value="Generator to XML"><br>
- <input type="button" onClick="testCategorytoXML()" value="Category to XML"><br>
- <input type="button" onClick="testLinktoXML()" value="Link to XML"><br>
- <input type="button" onClick="testEntrytoXML()" value="Entry to XML"><br>
- <input type="button" onClick="testFeedtoXML()" value="Feed to XML"><br>
- <h2>Results</h2>
- <code id="results">
- </code>
-</body>
+<!--
+ * 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.
+-->
+<html>
+<head>
+<title>Atom JavaScript Client Unit Tests</title>
+
+<!-- Include Tuscany JavaScript client model for Atom.
+ Using this JavaScript model, users can use syntax such as:
+ item += "name=" + entry.getName() + ", price=" + entry.getContent()
+ rather than
+ item += entries[i].getElementsByTagName("content")[0].firstChild.nodeValue;
+ -->
+<script type="text/javascript" src="atomModel.js"></script>
+
+<script language="JavaScript">
+
+ function testUritoXML() {
+ var test = new Uri( "http://example.org/edit/first-post.atom" );
+ var text = text.toXML();
+ alert( "Uri=" + text );
+ }
+
+ function testEmailtoXML() {
+ var test = new Email( "john.doe@ibm.com" );
+ var text = test.toXML();
+ alert( "Email=" + text );
+ }
+
+ function testIdtoXML() {
+ var test = new Id( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );
+ var text = test.toXML();
+ alert( "Id=" + text );
+ }
+
+ function testLogotoXML() {
+ var test = new Logo( "goofyGraphic.png" );
+ var text = test.toXML();
+ alert( "Logo=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testTexttoXML() {
+ var test = new Text( "This is ordinary text." );
+ var text = test.toXML();
+ alert( "Text=" + text );
+ var test = new Text( "This is <b>HTML</b> text.", "html" );
+ var text = test.toXML( "supertext" );
+ alert( "Text=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testPersontoXML() {
+ var test = new Person( "John Doe", "john.doe@ibm.com" );
+ var text = test.toXML();
+ alert( "Person=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testGeneratortoXML() {
+ var test = new Generator( "Power Station", "http://www.powerstation.com" );
+ var text = test.toXML();
+ alert( "Generator=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testCategorytoXML() {
+ var test = new Category( "CategoryXYZ", "http://www.site.com/?category=CategoryXYZ" );
+ var text = test.toXML();
+ alert( "Category=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testLinktoXML() {
+ var test = new Link( "http://example.org/edit/first-post.atom", "edit" );
+ var text = test.toXML();
+ alert( "Link=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testEntrytoXML() {
+ // <?xml version="1.0"?>
+ // <entry xmlns="http://www.w3.org/2005/Atom">
+ // <title>Atom-Powered Robots Run Amok</title>
+ // <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
+ // <updated>2003-12-13T18:30:02Z</updated>
+ // <author><name>John Doe</name></author>
+ // <content>Some text.</content>
+ // <link rel="edit" href="http://example.org/edit/first-post.atom"/>
+ // </entry>
+
+ var entry = new Entry();
+ entry.setNamespace( "http://www.w3.org/2005/Atom" );
+ entry.setTitle( "Atom-Powered Robots Run Amok" );
+ entry.setId( "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a" );
+ entry.setUpdated( "2003-12-13T18:30:02Z" );
+ entry.setContent( "Some text." );
+ entry.addAuthor( new Person( "John Doe" ) );
+ entry.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));
+ entry.addContributor( new Person( "Sam Ruby" ));
+ entry.addContributor( new Person( "Joe Gregorio" ));
+ entry.addLink( new Link( "http://example.org/edit/first-post.atom", "edit" ));
+ var text = entry.toXML();
+
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function testFeedtoXML() {
+ // <feed xmlns="http://www.w3.org/2005/Atom">
+ // <title type="text">dive into mark</title>
+ // <subtitle type="html">A <em>lot</em> of effort went into making this effortless </subtitle>
+ // <updated>2005-07-31T12:29:29Z</updated>
+ // <id>tag:example.org,2003:3</id>
+ // <link rel="alternate" type="text/html" hreflang="en" href="http://example.org/"/>
+ // <link rel="self" type="application/atom+xml" href="http://example.org/feed.atom"/>
+ // <rights>Copyright (c) 2003, Mark Pilgrim</rights>
+ // <generator uri="http://www.example.com/" version="1.0">Example Toolkit</generator>
+ // <entry>
+ // <title>Atom draft-07 snapshot</title>
+ // <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>
+ // <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+ // <id>tag:example.org,2003:3.2397</id>
+ // <updated>2005-07-31T12:29:29Z</updated>
+ // <published>2003-12-13T08:29:29-04:00</published>
+ // <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>
+ // <contributor><name>Sam Ruby</name></contributor>
+ // <contributor><name>Joe Gregorio</name></contributor>
+ // <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/">
+ // <div xmlns="http://www.w3.org/1999/xhtml">
+ // <p><i>[Update: The Atom draft is finished.]</i></p>
+ // </div>
+ // </content>
+ // </entry>
+ // <entry>
+ // <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>
+ // <category term="triathlons"/>
+ // <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>
+ // <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>
+ // <published>2008-09-05T14:09:32-05:00</published>
+ // <updated>2008-09-06T08:49:12-05:00</updated>
+ // <summary type='html'>
+ // <a href='http://www.io.com/~beckerdo/triathlons/besthills.html'><img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'></a>
+ // A description and Google maps of the best running and biking hills in Austin, Texas.
+ // </summary>
+ // </entry>
+ // </feed>
+
+ var feed = new Feed( "Dive into Mark" );
+ feed.setSubtitle( new Text( "A <em>lot</em> of effort went into making this effortless", "html" ));
+ feed.setUpdated( "2005-07-31T12:29:29Z" );
+ feed.setId( "tag:example.org,2003:3" );
+ var link = new Link( "http://example.org", "alternate" );
+ link.setMimeType( "text/html" );
+ link.setHRefLang( "en" );
+ feed.addLink( link );
+ feed.addLink( new Link( "http://example.org/feed.atom", "self" ));
+ feed.setRights( "Copyright (c) 2003, Mark Pilgrim" );
+ feed.setGenerator( new Generator( "Example Toolkit", "http://www.example.com/" ));
+ feed.addAuthor( new Person( "Mark Pilgrim", "f8dy@example.com" ));
+ feed.addContributor( new Person( "Sam Ruby" ));
+ feed.addContributor( new Person( "Joe Gregorio" ));
+ // <entry>
+ // <title>Atom draft-07 snapshot</title>
+ // <link rel="alternate" type="text/html" href="http://example.org/2005/04/02/atom"/>
+ // <link rel="enclosure" type="audio/mpeg" length="1337" href="http://example.org/audio/ph34r_my_podcast.mp3"/>
+ // <id>tag:example.org,2003:3.2397</id>
+ // <updated>2005-07-31T12:29:29Z</updated>
+ // <published>2003-12-13T08:29:29-04:00</published>
+ // <author><name>Mark Pilgrim</name><uri>http://example.org/</uri><email>f8dy@example.com</email></author>
+ // <contributor><name>Sam Ruby</name></contributor>
+ // <contributor><name>Joe Gregorio</name></contributor>
+ // <content type="xhtml" xml:lang="en" xml:base="http://diveintomark.org/">
+ // <div xmlns="http://www.w3.org/1999/xhtml">
+ // <p><i>[Update: The Atom draft is finished.]</i></p>
+ // </div>
+ // </content>
+ // </entry>
+ // <entry>
+ // <title>Dan Becker's Triathlon Site - Best Hills In Austin</title>
+ // <category term="triathlons"/>
+ // <id>tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html</id>
+ // <link href="http://www.io.com/~beckerdo/triathlons/besthills.html"/>
+ // <published>2008-09-05T14:09:32-05:00</published>
+ // <updated>2008-09-06T08:49:12-05:00</updated>
+ // <summary type='html'>
+ // <a href='http://www.io.com/~beckerdo/triathlons/besthills.html'><img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'></a>
+ // A description and Google maps of the best running and biking hills in Austin, Texas.
+ // </summary>
+ // </entry>
+ // </feed>
+ var entry = new Entry( "Dan Becker's Triathlon Site - Best Hills In Austin" );
+ entry.addCategory( new Category( "running" ));
+ entry.addCategory( new Category( "triathlons" ));
+ entry.setId( "tag:www.io.com,2008-09-05:/~beckerdo/triathlons/besthills.html" );
+ entry.addLink( new Link ( "http://www.io.com/~beckerdo/triathlons/besthills.html" ));
+ entry.setPublished( "2008-09-05T14:09:32-05:00" );
+ entry.setUpdated( "2008-09-06T08:49:12-05:00" );
+ entry.setSummary( new Text (
+ "<a href='http://www.io.com/~beckerdo/triathlons/besthills.html'><img src='http://www.io.com/~beckerdo/pictures/LittleDan25.png' width='25' height='25' alt='Little Dan' align='left'></a>\n" +
+ "A description and Google maps of the best running and biking hills in Austin, Texas.", "html" ));
+ feed.addEntry( entry );
+
+ var text = feed.toXML();
+ alert( "Feed xml=" + text );
+ document.getElementById('results').innerHTML = removeBrackets( text );
+ }
+
+ function removeBrackets( input ) {
+ input = input.replace( /</g, "<" ); // replaceAll
+ input = input.replace( />/g, ">" ); // replaceAll
+ return input;
+ }
+</script>
+</head>
+
+<body>
+<h1>Atom JavaScript Client Unit Tests</h1>
+<p>This document tests the serialization and deserialization of the Atom JavaScript client.
+ <h2>Model to XML Tests</h2>
+ <input type="button" onClick="testUritoXML()" value="Uri to XML"><br>
+ <input type="button" onClick="testEmailtoXML()" value="Email to XML"><br>
+ <input type="button" onClick="testIdtoXML()" value="Id to XML"><br>
+ <input type="button" onClick="testLogotoXML()" value="Logo to XML"><br>
+ <input type="button" onClick="testTexttoXML()" value="Text to XML"><br>
+ <input type="button" onClick="testPersontoXML()" value="Person to XML"><br>
+ <input type="button" onClick="testGeneratortoXML()" value="Generator to XML"><br>
+ <input type="button" onClick="testCategorytoXML()" value="Category to XML"><br>
+ <input type="button" onClick="testLinktoXML()" value="Link to XML"><br>
+ <input type="button" onClick="testEntrytoXML()" value="Entry to XML"><br>
+ <input type="button" onClick="testFeedtoXML()" value="Feed to XML"><br>
+ <h2>Results</h2>
+ <code id="results">
+ </code>
+</body>
</html>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime-tuscany/src/test/resources/widgetJS.composite Mon Oct 26 23:44:59 2009
@@ -1,58 +1,58 @@
-<?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"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample/resource"
- xmlns:sr="http://sample/resource"
- name="resource">
-
- <component name="storeJS">
- <!-- Note: the store.html and storeJS.html clients are similar
- except that store.html edits the client document using JavaScript
- and many node queries, and storeJS.html uses the client Atom
- JavaScript mode (fewer node queries and less XML knowledge needed.-->
- <tuscany:implementation.widget location="content/storeJS.html"/>
- <property name="locale">en</property>
- <service name="Widget">
- <tuscany:binding.http uri="/storeJS"/>
- </service>
- <reference name="Catalog" target="Catalog">
- <tuscany:binding.jsonrpc uri="/Catalog"/>
- </reference>
- <reference name="ShoppingCart" target="ShoppingCart">
- <tuscany:binding.atom uri="/ShoppingCart"/>
- </reference>
- </component>
-
- <component name="Catalog">
- <implementation.java class="store.CatalogImpl"/>
- <service name="Catalog">
- <tuscany:binding.jsonrpc uri="/Catalog"/>
- </service>
- </component>
-
- <component name="ShoppingCart">
- <implementation.java class="store.ShoppingCartImpl"/>
- <service name="Collection">
- <tuscany:binding.atom uri="/ShoppingCart"/>
- </service>
- </component>
-
-</composite>
+<?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"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ targetNamespace="http://sample/resource"
+ xmlns:sr="http://sample/resource"
+ name="resource">
+
+ <component name="storeJS">
+ <!-- Note: the store.html and storeJS.html clients are similar
+ except that store.html edits the client document using JavaScript
+ and many node queries, and storeJS.html uses the client Atom
+ JavaScript mode (fewer node queries and less XML knowledge needed.-->
+ <tuscany:implementation.widget location="content/storeJS.html"/>
+ <property name="locale">en</property>
+ <service name="Widget">
+ <tuscany:binding.http uri="/storeJS"/>
+ </service>
+ <reference name="Catalog" target="Catalog">
+ <tuscany:binding.jsonrpc uri="/Catalog"/>
+ </reference>
+ <reference name="ShoppingCart" target="ShoppingCart">
+ <tuscany:binding.atom uri="/ShoppingCart"/>
+ </reference>
+ </component>
+
+ <component name="Catalog">
+ <implementation.java class="store.CatalogImpl"/>
+ <service name="Catalog">
+ <tuscany:binding.jsonrpc uri="/Catalog"/>
+ </service>
+ </component>
+
+ <component name="ShoppingCart">
+ <implementation.java class="store.ShoppingCartImpl"/>
+ <service name="Collection">
+ <tuscany:binding.atom uri="/ShoppingCart"/>
+ </service>
+ </component>
+
+</composite>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget-runtime/src/main/java/org/apache/tuscany/sca/implementation/widget/provider/WidgetImplementationProvider.java Mon Oct 26 23:44:59 2009
@@ -90,7 +90,7 @@
WidgetComponentScriptServlet widgetScriptServlet;
widgetScriptServlet = new WidgetComponentScriptServlet(this.component, javaScriptGenerator);
servletHost.addServletMapping(scriptURI, widgetScriptServlet);
- }
+ }
}
public void stop() {
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationFactory.java Mon Oct 26 23:44:59 2009
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.implementation.widget;
-
/**
* Factory for the widget implementation model.
*
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/WidgetImplementationProcessor.java Mon Oct 26 23:44:59 2009
@@ -160,7 +160,7 @@
}
public void write(WidgetImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
- // Write <implementation.widget>
+ // Write <implementation.widget>
writeStart(writer, IMPLEMENTATION_WIDGET.getNamespaceURI(), IMPLEMENTATION_WIDGET.getLocalPart());
if (implementation.getLocation() != null) {
Modified: tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-widget/src/main/java/org/apache/tuscany/sca/implementation/widget/impl/WidgetImplementationFactoryImpl.java Mon Oct 26 23:44:59 2009
@@ -21,6 +21,7 @@
import org.apache.tuscany.sca.assembly.AssemblyFactory;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.implementation.widget.WidgetImplementation;
import org.apache.tuscany.sca.implementation.widget.WidgetImplementationFactory;
import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
@@ -39,7 +40,7 @@
javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
}
- public WidgetImplementationImpl createWidgetImplementation() {
+ public WidgetImplementation createWidgetImplementation() {
return new WidgetImplementationImpl(assemblyFactory, javaFactory);
}
Modified: tuscany/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java (original)
+++ tuscany/branches/sca-java-1.x/modules/interface-java-jaxws/src/main/java/org/apache/tuscany/sca/interfacedef/java/jaxws/JAXWSFaultExceptionMapper.java Mon Oct 26 23:44:59 2009
@@ -30,6 +30,7 @@
import javax.xml.namespace.QName;
import javax.xml.ws.WebFault;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.jaxb.XMLAdapterExtensionPoint;
import org.apache.tuscany.sca.interfacedef.DataType;
@@ -62,6 +63,11 @@
this.dataBindingExtensionPoint = dataBindingExtensionPoint;
this.xmlAdapterExtensionPoint = xmlAdapters;
}
+
+ public JAXWSFaultExceptionMapper(ExtensionPointRegistry registry) {
+ this.dataBindingExtensionPoint = registry.getExtensionPoint(DataBindingExtensionPoint.class);
+ this.xmlAdapterExtensionPoint = registry.getExtensionPoint(XMLAdapterExtensionPoint.class);
+ }
/**
* The following is quoted from the JAX-WS Specification v2.1
@@ -394,9 +400,4 @@
return Character.toUpperCase(name.charAt(0)) + name.substring(1);
}
}
-
- public void setDataBindingExtensionPoint(DataBindingExtensionPoint dataBindingExtensionPoint) {
- this.dataBindingExtensionPoint = dataBindingExtensionPoint;
- }
-
}
Modified: tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java Mon Oct 26 23:44:59 2009
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.sca.interfacedef.impl;
+import java.lang.ref.WeakReference;
import java.lang.reflect.Type;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -43,8 +44,8 @@
*/
public class DataTypeImpl<L> implements DataType<L> {
private String dataBinding;
- private Class<?> physical;
- private Type genericType;
+ private WeakReference<Class<?>> physical;
+ private WeakReference<Type> genericType;
private L logical;
private Map<Class<?>, Object> metaDataMap;
@@ -77,8 +78,8 @@
public DataTypeImpl(String dataBinding, Class<?> physical, Type genericType, L logical) {
super();
this.dataBinding = dataBinding;
- this.physical = physical;
- this.genericType = genericType;
+ this.physical = new WeakReference<Class<?>>(physical);
+ this.genericType = new WeakReference<Type>(genericType);
this.logical = logical;
}
@@ -88,14 +89,14 @@
* @return the physical type used by the runtime
*/
public Class<?> getPhysical() {
- return physical;
+ return physical.get();
}
/**
* @param physical the physical to set
*/
public void setPhysical(Class<?> physical) {
- this.physical = physical;
+ this.physical = new WeakReference<Class<?>>(physical);
}
/**
@@ -103,7 +104,7 @@
* @return The java generic type
*/
public Type getGenericType() {
- return genericType;
+ return genericType.get();
}
/**
@@ -111,7 +112,7 @@
* @param genericType
*/
public void setGenericType(Type genericType) {
- this.genericType = genericType;
+ this.genericType = new WeakReference<Type>(genericType);
}
/**
@@ -161,9 +162,9 @@
final int prime = 31;
int result = 1;
result = prime * result + ((dataBinding == null) ? 0 : dataBinding.hashCode());
- result = prime * result + ((genericType == null) ? 0 : genericType.hashCode());
+ result = prime * result + ((genericType == null || genericType.get() == null) ? 0 : genericType.get().hashCode());
result = prime * result + ((logical == null) ? 0 : logical.hashCode());
- result = prime * result + ((physical == null) ? 0 : physical.hashCode());
+ result = prime * result + ((physical == null || physical.get() == null) ? 0 : physical.get().hashCode());
return result;
}
@@ -181,20 +182,20 @@
return false;
} else if (!dataBinding.equals(other.dataBinding))
return false;
- if (genericType == null) {
+ if (genericType == null || genericType.get() == null) {
if (other.genericType != null)
return false;
- } else if (!genericType.equals(other.genericType))
+ } else if (!genericType.get().equals(other.genericType.get()))
return false;
if (logical == null) {
if (other.logical != null)
return false;
} else if (!logical.equals(other.logical))
return false;
- if (physical == null) {
+ if (physical == null || physical.get() == null) {
if (other.physical != null)
return false;
- } else if (!physical.equals(other.physical))
+ } else if (!physical.get().equals(other.physical.get()))
return false;
return true;
}
@@ -219,8 +220,8 @@
StringBuilder b = new StringBuilder( 256 );
b.append( "DataType[" );
b.append( "dataBinding=" + ((dataBinding==null) ? "null" : dataBinding) );
- b.append( ", genericType=" + ((genericType==null) ? "null" : genericType) );
- b.append( ", physical=" + ((physical==null) ? "null" : physical) );
+ b.append( ", genericType=" + ((genericType==null || genericType.get()==null) ? "null" : genericType.get()) );
+ b.append( ", physical=" + ((physical==null || physical.get()==null) ? "null" : physical.get()) );
b.append( ", logical=" + ((logical==null) ? "null" : logical) );
b.append( ", metaData size=" + ((metaDataMap==null) ? "0" : metaDataMap.size()) );
b.append( "]" );
Modified: tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java Mon Oct 26 23:44:59 2009
@@ -209,8 +209,7 @@
}
for (Operation operation : source.getCallbackInterface().getOperations()) {
- Operation targetOperation =
- getOperation(target.getCallbackInterface().getOperations(), operation.getName());
+ Operation targetOperation = map(target.getCallbackInterface(), operation);
if (targetOperation == null) {
if (!silent) {
throw new IncompatibleInterfaceContractException("Callback operation not found on target", source,
@@ -221,7 +220,7 @@
}
if (!source.getCallbackInterface().isRemotable()) {
// FIXME: for remotable operation, only compare name for now
- if (!operation.equals(targetOperation)) {
+ if (!isCompatible(operation, targetOperation, false)) {
if (!silent) {
throw new IncompatibleInterfaceContractException("Target callback operation is not compatible",
source, target, operation, targetOperation);
Modified: tuscany/branches/sca-java-1.x/modules/node-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-impl/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/node-impl/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/node-impl/pom.xml Mon Oct 26 23:44:59 2009
@@ -115,6 +115,13 @@
<version>1.6-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-endpoint</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java (original)
+++ tuscany/branches/sca-java-1.x/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/RuntimeBootStrapper.java Mon Oct 26 23:44:59 2009
@@ -109,6 +109,7 @@
public void start() throws ActivationException {
long start = System.currentTimeMillis();
+ // Create our extension point registry
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
// Get work scheduler
Modified: tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java (original)
+++ tuscany/branches/sca-java-1.x/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java Mon Oct 26 23:44:59 2009
@@ -100,11 +100,9 @@
int k = 0;
try {
while ((k != 'q') && (k != 'r')) {
- // k = System.in.read();
- Thread.sleep(100);
-
+ k = System.in.read();
}
- } catch (Exception e) {
+ } catch (IOException e) {
// Wait forever
Object lock = new Object();
Modified: tuscany/branches/sca-java-1.x/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyInterceptor.java Mon Oct 26 23:44:59 2009
@@ -101,7 +101,7 @@
}
Object[] logParams = new Object[] {operation.getName(), sb.toString()};
- logger.logp(Level.FINER, context, "", "Invoking operation {0} with arguments ({1})", logParams);
+ logger.logp(Level.FINER, context, "", "Invoking operation {0} with arguments {1}", logParams);
}
Message responseMsg = null;
@@ -115,7 +115,7 @@
if (responseMsg != null) {
Object[] logParams = new Object[] {operation.getName(), responseMsg.getBody()};
logger.logp(Level.INFO, context, "", "Returned from operation - " + operation.getName());
- logger.logp(Level.FINER, context, "", "Returning from operation {0} with return value ({1})", logParams);
+ logger.logp(Level.FINER, context, "", "Returning from operation {0} with return value {1}", logParams);
}
}
}