You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/06/11 15:23:43 UTC
svn commit: r546141 - in /incubator/tuscany/java/sca/demos/alert-aggregator:
./ src/main/java/org/apache/tuscany/sca/demos/aggregator/
src/main/resources/ src/main/webapp/ src/main/webapp/WEB-INF/
src/test/java/org/apache/tuscany/sca/demos/aggregator/
Author: slaws
Date: Mon Jun 11 06:23:42 2007
New Revision: 546141
URL: http://svn.apache.org/viewvc?view=rev&rev=546141
Log:
catch up with module name/location change
Added:
incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER
incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE (with props)
incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE (with props)
incubator/tuscany/java/sca/demos/alert-aggregator/README (with props)
Modified:
incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css
incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
Added: incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER?view=auto&rev=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER (added)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER Mon Jun 11 06:23:42 2007
@@ -0,0 +1,8 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
+
Added: incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE?view=auto&rev=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE (added)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE Mon Jun 11 06:23:42 2007
@@ -0,0 +1,205 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+
Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE?view=auto&rev=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE (added)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE Mon Jun 11 06:23:42 2007
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/tuscany/java/sca/demos/alert-aggregator/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/README?view=auto&rev=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/README (added)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/README Mon Jun 11 06:23:42 2007
@@ -0,0 +1,82 @@
+Apache Tuscany Alert Aggregator Demo
+====================================
+
+The alert aggregator demo provides an application, implemented using SCA, that
+aggregates feeds together and exposes them using the following bindings.
+
+binding.ws
+binding.jsonrpc
+binding.feed
+
+The easiest way to get going is to build the demo
+
+cd alert-aggregator
+mvn
+
+This will build and test the source and generate a war file
+
+demo-alert-aggregator.war
+
+This war can be deployed to you web application container and tested (the war
+has been tested with Tomcat 6.0.10).
+
+The Web Application
+-------------------
+
+Once deployed point your browser at
+
+http://localhost:8080/demo-alert-aggregator
+
+Taking care to ensure the host name and port number match you local
+configuration.
+
+This launches a Javascript application in the browser that uses JSONRPC
+to contact the server and retrived a list of alert sources and alerts that
+these sources are providing.
+
+There default sources that you see are stored in a file in the following
+file
+
+demo-alert-aggregator/WEB-INF/classes/sources.xml
+
+This files has the following contents
+
+<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/demos/aggregator/types">
+<ns0:Source Id="0" FeedType="rss">
+ <ns0:Name>BBC News</ns0:Name>
+ <ns0:Address>http://news.bbc.co.uk/</ns0:Address>
+ <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
+ <ns0:FeedAddress>http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml</ns0:FeedAddress>
+</ns0:Source>
+<ns0:Source Id="1" FeedType="rss">
+ <ns0:Name>Engadget</ns0:Name>
+ <ns0:Address>http://www.engadget.com</ns0:Address>
+ <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
+ <ns0:FeedAddress>http://www.engadget.com/rss.xml</ns0:FeedAddress>
+</ns0:Source>
+</ns0:Config>
+
+You may want to adjust the "LastChecked" values to change the number of
+alerts that are displayed in the first instance
+
+Using A Feed Reader
+-------------------
+
+As this SCA application also uses the binding.feed binding you can use your
+favourite feed reader to read the aggregated alerts. To do this point your
+feed reader at
+
+http://localhost:8080/demo-alert-aggregator/services/AlertsFeedServiceRSS
+
+Again taking care to ensure that the host name and port number match you
+local configuration.
+
+Using Web Services
+------------------
+
+The SCA application also uses binding.ws to provide a SOAP/HTTP interface.
+The demo client that uses this interface is not yet available.
+
+
+
+
Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/README
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml Mon Jun 11 06:23:42 2007
@@ -33,7 +33,7 @@
<artifactId>alert-aggregator</artifactId>
<packaging>war</packaging>
<version>1.0-incubating-SNAPSHOT</version>
- <name>Apache Tuscany BigBank Alert Aggregator Demo</name>
+ <name>Apache Tuscany Alert Aggregator Demo</name>
<url>http://cwiki.apache.org/TUSCANY</url>
<dependencies>
@@ -133,7 +133,7 @@
</dependencies>
<build>
- <finalName>sample-feed-aggregator</finalName>
+ <finalName>demo-alert-aggregator</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -166,15 +166,15 @@
<schemaFiles>
<configuration>
<fileName>${project.build.directory}/classes/Alerts.wsdl</fileName>
- <javaPackage>org.apache.tuscany.sca.samples.aggregator.service</javaPackage>
+ <javaPackage>org.apache.tuscany.sca.demos.aggregator.service</javaPackage>
</configuration>
<configuration>
<fileName>${project.build.directory}/classes/AlertsSources.wsdl</fileName>
- <javaPackage>org.apache.tuscany.sca.samples.aggregator.sources</javaPackage>
+ <javaPackage>org.apache.tuscany.sca.demos.aggregator.sources</javaPackage>
</configuration>
<configuration>
<fileName>${project.build.directory}/classes/Alerts.xsd</fileName>
- <javaPackage>org.apache.tuscany.sca.samples.aggregator.types</javaPackage>
+ <javaPackage>org.apache.tuscany.sca.demos.aggregator.types</javaPackage>
</configuration>
</schemaFiles>
<noNotification>true</noNotification>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
@@ -4,12 +4,12 @@
*
* $Id$
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import commonj.sdo.Type;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
import org.apache.tuscany.sdo.impl.DataObjectBase;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java Mon Jun 11 06:23:42 2007
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
-import org.apache.tuscany.sca.samples.aggregator.types.impl.AlertsTypeImpl;
+import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
+import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
+import org.apache.tuscany.sca.demos.aggregator.types.impl.AlertsTypeImpl;
import org.osoa.sca.annotations.Service;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java Mon Jun 11 06:23:42 2007
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java Mon Jun 11 06:23:42 2007
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
-import org.apache.tuscany.sca.samples.aggregator.types.impl.AlertsTypeImpl;
+import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
+import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
+import org.apache.tuscany.sca.demos.aggregator.types.impl.AlertsTypeImpl;
import org.osoa.sca.annotations.Service;
import org.osoa.sca.annotations.Reference;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java Mon Jun 11 06:23:42 2007
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
-import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
+import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
+import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
import org.osoa.sca.annotations.Remotable;
import org.osoa.sca.annotations.Service;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java Mon Jun 11 06:23:42 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import java.io.FileInputStream;
import java.io.InputStream;
@@ -25,12 +25,12 @@
import java.util.Date;
import java.util.List;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
-import org.apache.tuscany.sca.samples.aggregator.types.impl.ConfigTypeImpl;
-import org.apache.tuscany.sca.samples.aggregator.types.impl.SourceTypeImpl;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
+import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.impl.ConfigTypeImpl;
+import org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
import org.apache.tuscany.sdo.util.SDOUtil;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import commonj.sdo.Type;
@@ -12,9 +12,9 @@
import java.util.Collection;
import java.util.List;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
import org.apache.tuscany.sdo.impl.DataObjectBase;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
@@ -4,7 +4,7 @@
*
* $Id$
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import commonj.sdo.Type;
@@ -12,9 +12,9 @@
import java.util.Collection;
import java.util.List;
-import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
-import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
+import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
import org.apache.tuscany.sdo.impl.DataObjectBase;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java Mon Jun 11 06:23:42 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
/**
* The interface for the rss checker service
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java Mon Jun 11 06:23:42 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import java.net.URL;
import java.util.Date;
@@ -25,9 +25,9 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
-import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
+import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
@@ -4,13 +4,13 @@
*
* $Id$
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import commonj.sdo.Sequence;
import commonj.sdo.Type;
-import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
-import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
+import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
+import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
import org.apache.tuscany.sdo.impl.DataObjectBase;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl Mon Jun 11 06:23:42 2007
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/service"
- xmlns:tns="http://tuscany.apache.org/sca/samples/aggregator/service"
+<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/service"
+ xmlns:tns="http://tuscany.apache.org/sca/demos/aggregator/service"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -26,11 +26,11 @@
<wsdl:types>
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/service"
- xmlns:alerter="http://tuscany.apache.org/sca/samples/aggregator/types"
+ targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/service"
+ xmlns:alerter="http://tuscany.apache.org/sca/demos/aggregator/types"
elementFormDefault="qualified">
- <xsd:import namespace="http://tuscany.apache.org/sca/samples/aggregator/types"
+ <xsd:import namespace="http://tuscany.apache.org/sca/demos/aggregator/types"
schemaLocation="Alerts.xsd" />
<element name="getAllNewAlerts">
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd Mon Jun 11 06:23:42 2007
@@ -17,9 +17,9 @@
specific language governing permissions and limitations
under the License.
-->
-<schema targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/types"
+<schema targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/types"
xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ns="http://tuscany.apache.org/sca/samples/aggregator/types">
+ xmlns:ns="http://tuscany.apache.org/sca/demos/aggregator/types">
<element name="Alerts" type="ns:AlertsType"/>
<complexType name="AlertType">
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl Mon Jun 11 06:23:42 2007
@@ -17,8 +17,8 @@
* specific language governing permissions and limitations
* under the License.
-->
-<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/sources"
- xmlns:tns="http://tuscany.apache.org/sca/samples/aggregator/sources"
+<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/sources"
+ xmlns:tns="http://tuscany.apache.org/sca/demos/aggregator/sources"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
@@ -26,11 +26,11 @@
<wsdl:types>
<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/sources"
- xmlns:alerter="http://tuscany.apache.org/sca/samples/aggregator/types"
+ targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/sources"
+ xmlns:alerter="http://tuscany.apache.org/sca/demos/aggregator/types"
elementFormDefault="qualified">
- <xsd:import namespace="http://tuscany.apache.org/sca/samples/aggregator/types"
+ <xsd:import namespace="http://tuscany.apache.org/sca/demos/aggregator/types"
schemaLocation="Alerts.xsd" />
<element name="getAlertSources">
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite Mon Jun 11 06:23:42 2007
@@ -24,8 +24,8 @@
name="FeedAggregator">
<!-- SDO factory classes -->
- <dbsdo:import.sdo factory="org.apache.tuscany.sca.samples.aggregator.service.ServiceFactory"/>
- <dbsdo:import.sdo factory="org.apache.tuscany.sca.samples.aggregator.types.TypesFactory"/>
+ <dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.service.ServiceFactory"/>
+ <dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.types.TypesFactory"/>
<!-- The alerts rss service -->
<service name="AlertsFeedServiceRSS" promote="AlertsFeedServiceComponent/Feed">
@@ -38,48 +38,47 @@
</service>
<component name="AlertsFeedServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.samples.aggregator.AlertsFeedServiceImpl" />
+ <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsFeedServiceImpl" />
<reference name="alerts" target="AlertsServiceComponent"/>
</component>
<!-- The alerts web service -->
<service name="AlertsService" promote="AlertsServiceComponent">
- <interface.wsdl interface="http://tuscany.apache.org/sca/samples/aggregator/service#wsdl.interface(AlertsPortType)"/>
- <binding.ws wsdlElement="http://tuscany.apache.org/sca/samples/aggregator/service#wsdl.port(AlertsService/AlertsPort)"/>
+ <interface.wsdl interface="http://tuscany.apache.org/sca/demos/aggregator/service#wsdl.interface(AlertsPortType)"/>
+ <binding.ws wsdlElement="http://tuscany.apache.org/sca/demos/aggregator/service#wsdl.port(AlertsService/AlertsPort)"/>
</service>
<!-- The alerts jsonrpc service -->
<service name="AlertsServiceJSONRPC" promote="AlertsServiceComponent/AlertsService">
- <interface.java interface="org.apache.tuscany.sca.samples.aggregator.AlertsService" />
+ <interface.java interface="org.apache.tuscany.sca.demos.aggregator.AlertsService" />
<binding.jsonrpc />
</service>
<component name="AlertsServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.samples.aggregator.AlertsServiceImpl" />
+ <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsServiceImpl" />
<reference name="rssChecker" target="RSSCheckerComponent"/>
<reference name="alertsSources" target="AlertsSourcesServiceComponent"/>
</component>
<!-- The alerts sources web service -->
<service name="AlertsSourcesService" promote="AlertsSourcesServiceComponent">
- <interface.wsdl interface="http://tuscany.apache.org/sca/samples/aggregator/sources#wsdl.interface(AlertsSourcesPortType)"/>
- <binding.ws wsdlElement="http://tuscany.apache.org/sca/samples/aggregator/sources#wsdl.port(AlertsSourcesService/AlertsSourcesPort)"/>
+ <interface.wsdl interface="http://tuscany.apache.org/sca/demos/aggregator/sources#wsdl.interface(AlertsSourcesPortType)"/>
+ <binding.ws wsdlElement="http://tuscany.apache.org/sca/demos/aggregator/sources#wsdl.port(AlertsSourcesService/AlertsSourcesPort)"/>
</service>
<!-- The alerts jsonrpc service -->
<service name="AlertsSourcesServiceJSONRPC" promote="AlertsSourcesServiceComponent/AlertsSourcesService">
- <interface.java interface="org.apache.tuscany.sca.samples.aggregator.AlertsSourcesService" />
+ <interface.java interface="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesService" />
<binding.jsonrpc />
</service>
<component name="AlertsSourcesServiceComponent">
- <implementation.java class="org.apache.tuscany.sca.samples.aggregator.AlertsSourcesServiceImpl" />
+ <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesServiceImpl" />
</component>
<!-- The RSS reader -->
<component name="RSSCheckerComponent">
- <!--implementation.script script="aggregator/RSSCheckerImpl.py"/-->
- <implementation.java class="org.apache.tuscany.sca.samples.aggregator.RSSCheckerServiceImpl"/>
+ <implementation.java class="org.apache.tuscany.sca.demos.aggregator.RSSCheckerServiceImpl"/>
</component>
</composite>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml Mon Jun 11 06:23:42 2007
@@ -17,17 +17,17 @@
specific language governing permissions and limitations
under the License.
-->
-<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/samples/aggregator/types">
+<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/demos/aggregator/types">
<ns0:Source Id="0" FeedType="rss">
<ns0:Name>BBC News</ns0:Name>
<ns0:Address>http://news.bbc.co.uk/</ns0:Address>
- <ns0:LastChecked>01-Jun-2007 16:34:03</ns0:LastChecked>
+ <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
<ns0:FeedAddress>http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml</ns0:FeedAddress>
</ns0:Source>
<ns0:Source Id="1" FeedType="rss">
<ns0:Name>Engadget</ns0:Name>
<ns0:Address>http://www.engadget.com</ns0:Address>
- <ns0:LastChecked>01-Jun-2007 16:34:03</ns0:LastChecked>
+ <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
<ns0:FeedAddress>http://www.engadget.com/rss.xml</ns0:FeedAddress>
</ns0:Source>
</ns0:Config>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html Mon Jun 11 06:23:42 2007
@@ -65,7 +65,7 @@
this.feedAddress = feedAddress;
this.feedType = feedType;
this.lastChecked = lastChecked;
- this.javaClass = "org.apache.tuscany.sca.samples.aggregator.types.impl.SourceTypeImpl";
+ this.javaClass = "org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl";
}
@@ -82,6 +82,7 @@
{
response = alertSourcesService.getAlertSources("Dojo");
response.addCallbacks(getAlertSourcesCallback, errorCallback);
+
getAlerts();
}
@@ -102,7 +103,7 @@
text = text + "<table>";
text = text + "<TR CLASS='source_" + source.id + "' >";
- text = text + " <TD CLASS='clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
+ text = text + " <TD CLASS='source_name clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
text = text + " <IMG SRC='rss.png'/> " + source.name;
text = text + " </TD>";
text = text + " <TD CLASS='clickable link' ONCLICK=\"showEditSource('" + source.id + "')\">Edit</TD>";
@@ -230,8 +231,10 @@
{
hideAddNewSource(sourceid);
var source = getSource(sourceid);
- alertSourcesService.addAlertSource(source);
- getAlertSources();
+ alertSourcesService.addAlertSource(source);
+
+ // wait a little before getting the list back from the server
+ setTimeout("getAlertSources()",1250);
}
function getSource(sourceid)
@@ -311,7 +314,7 @@
</script>
- <h1 id="top">Apache Tuscany Feed Aggregator Sample</h1>
+ <h1 id="top">Apache Tuscany Alert Aggregator Demo</h1>
<div id="errors"></div>
<p>Alert Sources<span id="refreshSources"></span>:</p>
<!--input type="button" value="getSources" onclick="getAlertSources()"/-->
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml Mon Jun 11 06:23:42 2007
@@ -22,7 +22,7 @@
Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <display-name>Tuscany Feed Aggregator Sample</display-name>
+ <display-name>Tuscany Alert Aggregator Demo</display-name>
<listener>
<listener-class>org.apache.tuscany.sca.webapp.TuscanyContextListener</listener-class>
@@ -39,7 +39,7 @@
</servlet-mapping>
<welcome-file-list id="WelcomeFileList">
- <welcome-file>FeedAggregator.html</welcome-file>
+ <welcome-file>AlertAggregator.html</welcome-file>
</welcome-file-list>
</web-app>
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css Mon Jun 11 06:23:42 2007
@@ -107,6 +107,11 @@
display: none;
}
+.source_name
+{
+width: 600px;
+}
+
.alert_text
{
width: 600px;
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java?view=diff&rev=546141&r1=546140&r2=546141
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java Mon Jun 11 06:23:42 2007
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.samples.aggregator;
+package org.apache.tuscany.sca.demos.aggregator;
import java.io.ByteArrayInputStream;
@@ -50,29 +50,30 @@
protected void tearDown() {
scaDomain.close();
}
-
+
+/* Use this if you want to test locally without deploying to a web container
public void testWait() throws Exception {
System.out.println("Feed aggregator server started (press enter to shutdown)");
- // System.in.read();
+ System.in.read();
System.out.println("Feed aggregator server stopped");
}
+*/
- /*
public void testGetAllNewAlerts() throws Exception {
JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAllNewAlerts\",\"id\":2}");
- JSONObject jsonResp = callService ("http://localhost:8080/AlertsServiceJSONRPC",
+ JSONObject jsonResp = callService ("http://localhost:8085/SCADomain/AlertsServiceJSONRPC",
jsonRequest);
- }
+ }
public void testAddAlertSources() throws Exception {
- JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.samples.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}");
- JSONObject jsonResp = callService ("http://localhost:8080/AlertsSourcesServiceJSONRPC",
+ JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}");
+ JSONObject jsonResp = callService ("http://localhost:8085/SCADomain/AlertsSourcesServiceJSONRPC",
jsonRequest);
}
- public void testGetAlertSources() throws Exception {
+ public void testGetAlertSources() throws Exception {
JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAlertSources\",\"id\":2}");
- JSONObject jsonResp = callService ("http://localhost:8080/SCADomain/AlertsSourcesServiceJSONRPC",
+ JSONObject jsonResp = callService ("http://localhost:8085/SCADomain/AlertsSourcesServiceJSONRPC",
jsonRequest);
assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name"));
}
@@ -87,5 +88,4 @@
assertEquals(200, response.getResponseCode());
return new JSONObject(response.getText());
}
- */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org
Re: Fixed alert-aggregator/pom.xml, was: svn commit: r546141
Posted by Jean-Sebastien Delfino <js...@apache.org>.
Jean-Sebastien Delfino wrote:
> Jean-Sebastien Delfino wrote:
>> The alert aggregator demo module was not compiling. I fixed it by
>> changing a dependency scope from "runtime" to "compile" in pom.xml
>> under revision r546698.
>>
>> Also removed some tabs in pom.xml and fixed the svn:ignore properties
>> under the root of the module and src/main/webapp.
>>
>>
>
> One more change: Other demos name their artifact id demo-*. If there's
> no objection I'll change the artifact id from alert-aggregator to
> demo-alert-aggregator.
>
Done under revision r546962.
--
Jean-Sebastien
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Re: Fixed alert-aggregator/pom.xml, was: svn commit: r546141
Posted by Jean-Sebastien Delfino <js...@apache.org>.
Jean-Sebastien Delfino wrote:
> The alert aggregator demo module was not compiling. I fixed it by
> changing a dependency scope from "runtime" to "compile" in pom.xml
> under revision r546698.
>
> Also removed some tabs in pom.xml and fixed the svn:ignore properties
> under the root of the module and src/main/webapp.
>
>
One more change: Other demos name their artifact id demo-*. If there's
no objection I'll change the artifact id from alert-aggregator to
demo-alert-aggregator.
--
Jean-Sebastien
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Fixed alert-aggregator/pom.xml, was: svn commit: r546141
Posted by Jean-Sebastien Delfino <js...@apache.org>.
The alert aggregator demo module was not compiling. I fixed it by
changing a dependency scope from "runtime" to "compile" in pom.xml under
revision r546698.
Also removed some tabs in pom.xml and fixed the svn:ignore properties
under the root of the module and src/main/webapp.
slaws@apache.org wrote:
> Author: slaws
> Date: Mon Jun 11 06:23:42 2007
> New Revision: 546141
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=546141
> Log:
> catch up with module name/location change
>
> Added:
> incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER
> incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE (with props)
> incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE (with props)
> incubator/tuscany/java/sca/demos/alert-aggregator/README (with props)
> Modified:
> incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
> incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css
> incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
>
> Added: incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER?view=auto&rev=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER (added)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/DISCLAIMER Mon Jun 11 06:23:42 2007
> @@ -0,0 +1,8 @@
> +Apache Tuscany is an effort undergoing incubation at The Apache Software
> +Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
> +required of all newly accepted projects until a further review indicates that
> +the infrastructure, communications, and decision making process have stabilized
> +in a manner consistent with other successful ASF projects. While incubation
> +status is not necessarily a reflection of the completeness or stability of the
> +code, it does indicate that the project has yet to be fully endorsed by the ASF.
> +
>
> Added: incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE?view=auto&rev=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE (added)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE Mon Jun 11 06:23:42 2007
> @@ -0,0 +1,205 @@
> +
> + Apache License
> + Version 2.0, January 2004
> + http://www.apache.org/licenses/
> +
> + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> +
> + 1. Definitions.
> +
> + "License" shall mean the terms and conditions for use, reproduction,
> + and distribution as defined by Sections 1 through 9 of this document.
> +
> + "Licensor" shall mean the copyright owner or entity authorized by
> + the copyright owner that is granting the License.
> +
> + "Legal Entity" shall mean the union of the acting entity and all
> + other entities that control, are controlled by, or are under common
> + control with that entity. For the purposes of this definition,
> + "control" means (i) the power, direct or indirect, to cause the
> + direction or management of such entity, whether by contract or
> + otherwise, or (ii) ownership of fifty percent (50%) or more of the
> + outstanding shares, or (iii) beneficial ownership of such entity.
> +
> + "You" (or "Your") shall mean an individual or Legal Entity
> + exercising permissions granted by this License.
> +
> + "Source" form shall mean the preferred form for making modifications,
> + including but not limited to software source code, documentation
> + source, and configuration files.
> +
> + "Object" form shall mean any form resulting from mechanical
> + transformation or translation of a Source form, including but
> + not limited to compiled object code, generated documentation,
> + and conversions to other media types.
> +
> + "Work" shall mean the work of authorship, whether in Source or
> + Object form, made available under the License, as indicated by a
> + copyright notice that is included in or attached to the work
> + (an example is provided in the Appendix below).
> +
> + "Derivative Works" shall mean any work, whether in Source or Object
> + form, that is based on (or derived from) the Work and for which the
> + editorial revisions, annotations, elaborations, or other modifications
> + represent, as a whole, an original work of authorship. For the purposes
> + of this License, Derivative Works shall not include works that remain
> + separable from, or merely link (or bind by name) to the interfaces of,
> + the Work and Derivative Works thereof.
> +
> + "Contribution" shall mean any work of authorship, including
> + the original version of the Work and any modifications or additions
> + to that Work or Derivative Works thereof, that is intentionally
> + submitted to Licensor for inclusion in the Work by the copyright owner
> + or by an individual or Legal Entity authorized to submit on behalf of
> + the copyright owner. For the purposes of this definition, "submitted"
> + means any form of electronic, verbal, or written communication sent
> + to the Licensor or its representatives, including but not limited to
> + communication on electronic mailing lists, source code control systems,
> + and issue tracking systems that are managed by, or on behalf of, the
> + Licensor for the purpose of discussing and improving the Work, but
> + excluding communication that is conspicuously marked or otherwise
> + designated in writing by the copyright owner as "Not a Contribution."
> +
> + "Contributor" shall mean Licensor and any individual or Legal Entity
> + on behalf of whom a Contribution has been received by Licensor and
> + subsequently incorporated within the Work.
> +
> + 2. Grant of Copyright License. Subject to the terms and conditions of
> + this License, each Contributor hereby grants to You a perpetual,
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> + copyright license to reproduce, prepare Derivative Works of,
> + publicly display, publicly perform, sublicense, and distribute the
> + Work and such Derivative Works in Source or Object form.
> +
> + 3. Grant of Patent License. Subject to the terms and conditions of
> + this License, each Contributor hereby grants to You a perpetual,
> + worldwide, non-exclusive, no-charge, royalty-free, irrevocable
> + (except as stated in this section) patent license to make, have made,
> + use, offer to sell, sell, import, and otherwise transfer the Work,
> + where such license applies only to those patent claims licensable
> + by such Contributor that are necessarily infringed by their
> + Contribution(s) alone or by combination of their Contribution(s)
> + with the Work to which such Contribution(s) was submitted. If You
> + institute patent litigation against any entity (including a
> + cross-claim or counterclaim in a lawsuit) alleging that the Work
> + or a Contribution incorporated within the Work constitutes direct
> + or contributory patent infringement, then any patent licenses
> + granted to You under this License for that Work shall terminate
> + as of the date such litigation is filed.
> +
> + 4. Redistribution. You may reproduce and distribute copies of the
> + Work or Derivative Works thereof in any medium, with or without
> + modifications, and in Source or Object form, provided that You
> + meet the following conditions:
> +
> + (a) You must give any other recipients of the Work or
> + Derivative Works a copy of this License; and
> +
> + (b) You must cause any modified files to carry prominent notices
> + stating that You changed the files; and
> +
> + (c) You must retain, in the Source form of any Derivative Works
> + that You distribute, all copyright, patent, trademark, and
> + attribution notices from the Source form of the Work,
> + excluding those notices that do not pertain to any part of
> + the Derivative Works; and
> +
> + (d) If the Work includes a "NOTICE" text file as part of its
> + distribution, then any Derivative Works that You distribute must
> + include a readable copy of the attribution notices contained
> + within such NOTICE file, excluding those notices that do not
> + pertain to any part of the Derivative Works, in at least one
> + of the following places: within a NOTICE text file distributed
> + as part of the Derivative Works; within the Source form or
> + documentation, if provided along with the Derivative Works; or,
> + within a display generated by the Derivative Works, if and
> + wherever such third-party notices normally appear. The contents
> + of the NOTICE file are for informational purposes only and
> + do not modify the License. You may add Your own attribution
> + notices within Derivative Works that You distribute, alongside
> + or as an addendum to the NOTICE text from the Work, provided
> + that such additional attribution notices cannot be construed
> + as modifying the License.
> +
> + You may add Your own copyright statement to Your modifications and
> + may provide additional or different license terms and conditions
> + for use, reproduction, or distribution of Your modifications, or
> + for any such Derivative Works as a whole, provided Your use,
> + reproduction, and distribution of the Work otherwise complies with
> + the conditions stated in this License.
> +
> + 5. Submission of Contributions. Unless You explicitly state otherwise,
> + any Contribution intentionally submitted for inclusion in the Work
> + by You to the Licensor shall be under the terms and conditions of
> + this License, without any additional terms or conditions.
> + Notwithstanding the above, nothing herein shall supersede or modify
> + the terms of any separate license agreement you may have executed
> + with Licensor regarding such Contributions.
> +
> + 6. Trademarks. This License does not grant permission to use the trade
> + names, trademarks, service marks, or product names of the Licensor,
> + except as required for reasonable and customary use in describing the
> + origin of the Work and reproducing the content of the NOTICE file.
> +
> + 7. Disclaimer of Warranty. Unless required by applicable law or
> + agreed to in writing, Licensor provides the Work (and each
> + Contributor provides its Contributions) on an "AS IS" BASIS,
> + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
> + implied, including, without limitation, any warranties or conditions
> + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
> + PARTICULAR PURPOSE. You are solely responsible for determining the
> + appropriateness of using or redistributing the Work and assume any
> + risks associated with Your exercise of permissions under this License.
> +
> + 8. Limitation of Liability. In no event and under no legal theory,
> + whether in tort (including negligence), contract, or otherwise,
> + unless required by applicable law (such as deliberate and grossly
> + negligent acts) or agreed to in writing, shall any Contributor be
> + liable to You for damages, including any direct, indirect, special,
> + incidental, or consequential damages of any character arising as a
> + result of this License or out of the use or inability to use the
> + Work (including but not limited to damages for loss of goodwill,
> + work stoppage, computer failure or malfunction, or any and all
> + other commercial damages or losses), even if such Contributor
> + has been advised of the possibility of such damages.
> +
> + 9. Accepting Warranty or Additional Liability. While redistributing
> + the Work or Derivative Works thereof, You may choose to offer,
> + and charge a fee for, acceptance of support, warranty, indemnity,
> + or other liability obligations and/or rights consistent with this
> + License. However, in accepting such obligations, You may act only
> + on Your own behalf and on Your sole responsibility, not on behalf
> + of any other Contributor, and only if You agree to indemnify,
> + defend, and hold each Contributor harmless for any liability
> + incurred by, or claims asserted against, such Contributor by reason
> + of your accepting any such warranty or additional liability.
> +
> + END OF TERMS AND CONDITIONS
> +
> + APPENDIX: How to apply the Apache License to your work.
> +
> + To apply the Apache License to your work, attach the following
> + boilerplate notice, with the fields enclosed by brackets "[]"
> + replaced with your own identifying information. (Don't include
> + the brackets!) The text should be enclosed in the appropriate
> + comment syntax for the file format. We also recommend that a
> + file or class name and description of purpose be included on the
> + same "printed page" as the copyright notice for easier
> + identification within third-party archives.
> +
> + Copyright [yyyy] [name of copyright owner]
> +
> + Licensed 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.
> +
> +
> +
>
> Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/LICENSE
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE?view=auto&rev=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE (added)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE Mon Jun 11 06:23:42 2007
> @@ -0,0 +1,6 @@
> +${pom.name}
> +Copyright (c) 2005 - 2007 The Apache Software Foundation
> +
> +This product includes software developed by
> +The Apache Software Foundation (http://www.apache.org/).
> +
>
> Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/NOTICE
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Added: incubator/tuscany/java/sca/demos/alert-aggregator/README
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/README?view=auto&rev=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/README (added)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/README Mon Jun 11 06:23:42 2007
> @@ -0,0 +1,82 @@
> +Apache Tuscany Alert Aggregator Demo
> +====================================
> +
> +The alert aggregator demo provides an application, implemented using SCA, that
> +aggregates feeds together and exposes them using the following bindings.
> +
> +binding.ws
> +binding.jsonrpc
> +binding.feed
> +
> +The easiest way to get going is to build the demo
> +
> +cd alert-aggregator
> +mvn
> +
> +This will build and test the source and generate a war file
> +
> +demo-alert-aggregator.war
> +
> +This war can be deployed to you web application container and tested (the war
> +has been tested with Tomcat 6.0.10).
> +
> +The Web Application
> +-------------------
> +
> +Once deployed point your browser at
> +
> +http://localhost:8080/demo-alert-aggregator
> +
> +Taking care to ensure the host name and port number match you local
> +configuration.
> +
> +This launches a Javascript application in the browser that uses JSONRPC
> +to contact the server and retrived a list of alert sources and alerts that
> +these sources are providing.
> +
> +There default sources that you see are stored in a file in the following
> +file
> +
> +demo-alert-aggregator/WEB-INF/classes/sources.xml
> +
> +This files has the following contents
> +
> +<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/demos/aggregator/types">
> +<ns0:Source Id="0" FeedType="rss">
> + <ns0:Name>BBC News</ns0:Name>
> + <ns0:Address>http://news.bbc.co.uk/</ns0:Address>
> + <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
> + <ns0:FeedAddress>http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml</ns0:FeedAddress>
> +</ns0:Source>
> +<ns0:Source Id="1" FeedType="rss">
> + <ns0:Name>Engadget</ns0:Name>
> + <ns0:Address>http://www.engadget.com</ns0:Address>
> + <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
> + <ns0:FeedAddress>http://www.engadget.com/rss.xml</ns0:FeedAddress>
> +</ns0:Source>
> +</ns0:Config>
> +
> +You may want to adjust the "LastChecked" values to change the number of
> +alerts that are displayed in the first instance
> +
> +Using A Feed Reader
> +-------------------
> +
> +As this SCA application also uses the binding.feed binding you can use your
> +favourite feed reader to read the aggregated alerts. To do this point your
> +feed reader at
> +
> +http://localhost:8080/demo-alert-aggregator/services/AlertsFeedServiceRSS
> +
> +Again taking care to ensure that the host name and port number match you
> +local configuration.
> +
> +Using Web Services
> +------------------
> +
> +The SCA application also uses binding.ws to provide a SOAP/HTTP interface.
> +The demo client that uses this interface is not yet available.
> +
> +
> +
> +
>
> Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/README
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: incubator/tuscany/java/sca/demos/alert-aggregator/README
> ------------------------------------------------------------------------------
> svn:mime-type = text/plain
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/pom.xml Mon Jun 11 06:23:42 2007
> @@ -33,7 +33,7 @@
> <artifactId>alert-aggregator</artifactId>
> <packaging>war</packaging>
> <version>1.0-incubating-SNAPSHOT</version>
> - <name>Apache Tuscany BigBank Alert Aggregator Demo</name>
> + <name>Apache Tuscany Alert Aggregator Demo</name>
> <url>http://cwiki.apache.org/TUSCANY</url>
>
> <dependencies>
> @@ -133,7 +133,7 @@
> </dependencies>
>
> <build>
> - <finalName>sample-feed-aggregator</finalName>
> + <finalName>demo-alert-aggregator</finalName>
> <plugins>
> <plugin>
> <groupId>org.codehaus.mojo</groupId>
> @@ -166,15 +166,15 @@
> <schemaFiles>
> <configuration>
> <fileName>${project.build.directory}/classes/Alerts.wsdl</fileName>
> - <javaPackage>org.apache.tuscany.sca.samples.aggregator.service</javaPackage>
> + <javaPackage>org.apache.tuscany.sca.demos.aggregator.service</javaPackage>
> </configuration>
> <configuration>
> <fileName>${project.build.directory}/classes/AlertsSources.wsdl</fileName>
> - <javaPackage>org.apache.tuscany.sca.samples.aggregator.sources</javaPackage>
> + <javaPackage>org.apache.tuscany.sca.demos.aggregator.sources</javaPackage>
> </configuration>
> <configuration>
> <fileName>${project.build.directory}/classes/Alerts.xsd</fileName>
> - <javaPackage>org.apache.tuscany.sca.samples.aggregator.types</javaPackage>
> + <javaPackage>org.apache.tuscany.sca.demos.aggregator.types</javaPackage>
> </configuration>
> </schemaFiles>
> <noNotification>true</noNotification>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
> @@ -4,12 +4,12 @@
> *
> * $Id$
> */
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import commonj.sdo.Type;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
>
> import org.apache.tuscany.sdo.impl.DataObjectBase;
>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsFeedServiceImpl.java Mon Jun 11 06:23:42 2007
> @@ -17,19 +17,19 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import java.text.DateFormat;
> import java.util.ArrayList;
> import java.util.Date;
> import java.util.List;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
> -import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
> -import org.apache.tuscany.sca.samples.aggregator.types.impl.AlertsTypeImpl;
> +import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
> +import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
> +import org.apache.tuscany.sca.demos.aggregator.types.impl.AlertsTypeImpl;
>
> import org.osoa.sca.annotations.Service;
> import org.osoa.sca.annotations.Reference;
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsService.java Mon Jun 11 06:23:42 2007
> @@ -17,10 +17,10 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> -import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
>
> import org.osoa.sca.annotations.Remotable;
> import org.osoa.sca.annotations.Service;
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsServiceImpl.java Mon Jun 11 06:23:42 2007
> @@ -17,19 +17,19 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import java.text.DateFormat;
> import java.util.ArrayList;
> import java.util.Date;
> import java.util.List;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
> -import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
> -import org.apache.tuscany.sca.samples.aggregator.types.impl.AlertsTypeImpl;
> +import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
> +import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
> +import org.apache.tuscany.sca.demos.aggregator.types.impl.AlertsTypeImpl;
>
> import org.osoa.sca.annotations.Service;
> import org.osoa.sca.annotations.Reference;
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesService.java Mon Jun 11 06:23:42 2007
> @@ -17,10 +17,10 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
> -import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
> +import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
> +import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
>
> import org.osoa.sca.annotations.Remotable;
> import org.osoa.sca.annotations.Service;
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsSourcesServiceImpl.java Mon Jun 11 06:23:42 2007
> @@ -17,7 +17,7 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import java.io.FileInputStream;
> import java.io.InputStream;
> @@ -25,12 +25,12 @@
> import java.util.Date;
> import java.util.List;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> -import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
> -import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> -import org.apache.tuscany.sca.samples.aggregator.types.impl.ConfigTypeImpl;
> -import org.apache.tuscany.sca.samples.aggregator.types.impl.SourceTypeImpl;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
> +import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.impl.ConfigTypeImpl;
> +import org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl;
> import org.apache.tuscany.sdo.helper.XMLStreamHelper;
> import org.apache.tuscany.sdo.util.SDOUtil;
>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/AlertsTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
> @@ -4,7 +4,7 @@
> *
> * $Id$
> */
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import commonj.sdo.Type;
>
> @@ -12,9 +12,9 @@
> import java.util.Collection;
> import java.util.List;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
>
> import org.apache.tuscany.sdo.impl.DataObjectBase;
>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/ConfigTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
> @@ -4,7 +4,7 @@
> *
> * $Id$
> */
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import commonj.sdo.Type;
>
> @@ -12,9 +12,9 @@
> import java.util.Collection;
> import java.util.List;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.ConfigType;
> -import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.ConfigType;
> +import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
>
> import org.apache.tuscany.sdo.impl.DataObjectBase;
>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerService.java Mon Jun 11 06:23:42 2007
> @@ -16,9 +16,9 @@
> * specific language governing permissions and limitations
> * under the License.
> */
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
>
> /**
> * The interface for the rss checker service
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/RSSCheckerServiceImpl.java Mon Jun 11 06:23:42 2007
> @@ -16,7 +16,7 @@
> * specific language governing permissions and limitations
> * under the License.
> */
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import java.net.URL;
> import java.util.Date;
> @@ -25,9 +25,9 @@
> import java.text.DateFormat;
> import java.text.SimpleDateFormat;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertType;
> -import org.apache.tuscany.sca.samples.aggregator.types.AlertsType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertType;
> +import org.apache.tuscany.sca.demos.aggregator.types.AlertsType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
>
> import com.sun.syndication.feed.synd.SyndEntry;
> import com.sun.syndication.feed.synd.SyndFeed;
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/java/org/apache/tuscany/sca/demos/aggregator/SourceTypeNonSDOImpl.java Mon Jun 11 06:23:42 2007
> @@ -4,13 +4,13 @@
> *
> * $Id$
> */
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import commonj.sdo.Sequence;
> import commonj.sdo.Type;
>
> -import org.apache.tuscany.sca.samples.aggregator.types.SourceType;
> -import org.apache.tuscany.sca.samples.aggregator.types.TypesFactory;
> +import org.apache.tuscany.sca.demos.aggregator.types.SourceType;
> +import org.apache.tuscany.sca.demos.aggregator.types.TypesFactory;
>
> import org.apache.tuscany.sdo.impl.DataObjectBase;
>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.wsdl Mon Jun 11 06:23:42 2007
> @@ -17,8 +17,8 @@
> * specific language governing permissions and limitations
> * under the License.
> -->
> -<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/service"
> - xmlns:tns="http://tuscany.apache.org/sca/samples/aggregator/service"
> +<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/service"
> + xmlns:tns="http://tuscany.apache.org/sca/demos/aggregator/service"
> xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
> xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> @@ -26,11 +26,11 @@
>
> <wsdl:types>
> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
> - targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/service"
> - xmlns:alerter="http://tuscany.apache.org/sca/samples/aggregator/types"
> + targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/service"
> + xmlns:alerter="http://tuscany.apache.org/sca/demos/aggregator/types"
> elementFormDefault="qualified">
>
> - <xsd:import namespace="http://tuscany.apache.org/sca/samples/aggregator/types"
> + <xsd:import namespace="http://tuscany.apache.org/sca/demos/aggregator/types"
> schemaLocation="Alerts.xsd" />
>
> <element name="getAllNewAlerts">
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/Alerts.xsd Mon Jun 11 06:23:42 2007
> @@ -17,9 +17,9 @@
> specific language governing permissions and limitations
> under the License.
> -->
> -<schema targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/types"
> +<schema targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/types"
> xmlns="http://www.w3.org/2001/XMLSchema"
> - xmlns:ns="http://tuscany.apache.org/sca/samples/aggregator/types">
> + xmlns:ns="http://tuscany.apache.org/sca/demos/aggregator/types">
> <element name="Alerts" type="ns:AlertsType"/>
>
> <complexType name="AlertType">
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/AlertsSources.wsdl Mon Jun 11 06:23:42 2007
> @@ -17,8 +17,8 @@
> * specific language governing permissions and limitations
> * under the License.
> -->
> -<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/sources"
> - xmlns:tns="http://tuscany.apache.org/sca/samples/aggregator/sources"
> +<wsdl:definitions targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/sources"
> + xmlns:tns="http://tuscany.apache.org/sca/demos/aggregator/sources"
> xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
> xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
> xmlns:xsd="http://www.w3.org/2001/XMLSchema"
> @@ -26,11 +26,11 @@
>
> <wsdl:types>
> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
> - targetNamespace="http://tuscany.apache.org/sca/samples/aggregator/sources"
> - xmlns:alerter="http://tuscany.apache.org/sca/samples/aggregator/types"
> + targetNamespace="http://tuscany.apache.org/sca/demos/aggregator/sources"
> + xmlns:alerter="http://tuscany.apache.org/sca/demos/aggregator/types"
> elementFormDefault="qualified">
>
> - <xsd:import namespace="http://tuscany.apache.org/sca/samples/aggregator/types"
> + <xsd:import namespace="http://tuscany.apache.org/sca/demos/aggregator/types"
> schemaLocation="Alerts.xsd" />
>
> <element name="getAlertSources">
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/alerts.composite Mon Jun 11 06:23:42 2007
> @@ -24,8 +24,8 @@
> name="FeedAggregator">
>
> <!-- SDO factory classes -->
> - <dbsdo:import.sdo factory="org.apache.tuscany.sca.samples.aggregator.service.ServiceFactory"/>
> - <dbsdo:import.sdo factory="org.apache.tuscany.sca.samples.aggregator.types.TypesFactory"/>
> + <dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.service.ServiceFactory"/>
> + <dbsdo:import.sdo factory="org.apache.tuscany.sca.demos.aggregator.types.TypesFactory"/>
>
> <!-- The alerts rss service -->
> <service name="AlertsFeedServiceRSS" promote="AlertsFeedServiceComponent/Feed">
> @@ -38,48 +38,47 @@
> </service>
>
> <component name="AlertsFeedServiceComponent">
> - <implementation.java class="org.apache.tuscany.sca.samples.aggregator.AlertsFeedServiceImpl" />
> + <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsFeedServiceImpl" />
> <reference name="alerts" target="AlertsServiceComponent"/>
> </component>
>
> <!-- The alerts web service -->
> <service name="AlertsService" promote="AlertsServiceComponent">
> - <interface.wsdl interface="http://tuscany.apache.org/sca/samples/aggregator/service#wsdl.interface(AlertsPortType)"/>
> - <binding.ws wsdlElement="http://tuscany.apache.org/sca/samples/aggregator/service#wsdl.port(AlertsService/AlertsPort)"/>
> + <interface.wsdl interface="http://tuscany.apache.org/sca/demos/aggregator/service#wsdl.interface(AlertsPortType)"/>
> + <binding.ws wsdlElement="http://tuscany.apache.org/sca/demos/aggregator/service#wsdl.port(AlertsService/AlertsPort)"/>
> </service>
>
> <!-- The alerts jsonrpc service -->
> <service name="AlertsServiceJSONRPC" promote="AlertsServiceComponent/AlertsService">
> - <interface.java interface="org.apache.tuscany.sca.samples.aggregator.AlertsService" />
> + <interface.java interface="org.apache.tuscany.sca.demos.aggregator.AlertsService" />
> <binding.jsonrpc />
> </service>
>
> <component name="AlertsServiceComponent">
> - <implementation.java class="org.apache.tuscany.sca.samples.aggregator.AlertsServiceImpl" />
> + <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsServiceImpl" />
> <reference name="rssChecker" target="RSSCheckerComponent"/>
> <reference name="alertsSources" target="AlertsSourcesServiceComponent"/>
> </component>
>
> <!-- The alerts sources web service -->
> <service name="AlertsSourcesService" promote="AlertsSourcesServiceComponent">
> - <interface.wsdl interface="http://tuscany.apache.org/sca/samples/aggregator/sources#wsdl.interface(AlertsSourcesPortType)"/>
> - <binding.ws wsdlElement="http://tuscany.apache.org/sca/samples/aggregator/sources#wsdl.port(AlertsSourcesService/AlertsSourcesPort)"/>
> + <interface.wsdl interface="http://tuscany.apache.org/sca/demos/aggregator/sources#wsdl.interface(AlertsSourcesPortType)"/>
> + <binding.ws wsdlElement="http://tuscany.apache.org/sca/demos/aggregator/sources#wsdl.port(AlertsSourcesService/AlertsSourcesPort)"/>
> </service>
>
> <!-- The alerts jsonrpc service -->
> <service name="AlertsSourcesServiceJSONRPC" promote="AlertsSourcesServiceComponent/AlertsSourcesService">
> - <interface.java interface="org.apache.tuscany.sca.samples.aggregator.AlertsSourcesService" />
> + <interface.java interface="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesService" />
> <binding.jsonrpc />
> </service>
>
> <component name="AlertsSourcesServiceComponent">
> - <implementation.java class="org.apache.tuscany.sca.samples.aggregator.AlertsSourcesServiceImpl" />
> + <implementation.java class="org.apache.tuscany.sca.demos.aggregator.AlertsSourcesServiceImpl" />
> </component>
>
> <!-- The RSS reader -->
> <component name="RSSCheckerComponent">
> - <!--implementation.script script="aggregator/RSSCheckerImpl.py"/-->
> - <implementation.java class="org.apache.tuscany.sca.samples.aggregator.RSSCheckerServiceImpl"/>
> + <implementation.java class="org.apache.tuscany.sca.demos.aggregator.RSSCheckerServiceImpl"/>
> </component>
>
> </composite>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/resources/sources.xml Mon Jun 11 06:23:42 2007
> @@ -17,17 +17,17 @@
> specific language governing permissions and limitations
> under the License.
> -->
> -<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/samples/aggregator/types">
> +<ns0:Config xmlns:ns0="http://tuscany.apache.org/sca/demos/aggregator/types">
> <ns0:Source Id="0" FeedType="rss">
> <ns0:Name>BBC News</ns0:Name>
> <ns0:Address>http://news.bbc.co.uk/</ns0:Address>
> - <ns0:LastChecked>01-Jun-2007 16:34:03</ns0:LastChecked>
> + <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
> <ns0:FeedAddress>http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml</ns0:FeedAddress>
> </ns0:Source>
> <ns0:Source Id="1" FeedType="rss">
> <ns0:Name>Engadget</ns0:Name>
> <ns0:Address>http://www.engadget.com</ns0:Address>
> - <ns0:LastChecked>01-Jun-2007 16:34:03</ns0:LastChecked>
> + <ns0:LastChecked>10-Jun-2007 16:34:03</ns0:LastChecked>
> <ns0:FeedAddress>http://www.engadget.com/rss.xml</ns0:FeedAddress>
> </ns0:Source>
> </ns0:Config>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html Mon Jun 11 06:23:42 2007
> @@ -65,7 +65,7 @@
> this.feedAddress = feedAddress;
> this.feedType = feedType;
> this.lastChecked = lastChecked;
> - this.javaClass = "org.apache.tuscany.sca.samples.aggregator.types.impl.SourceTypeImpl";
> + this.javaClass = "org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl";
>
> }
>
> @@ -82,6 +82,7 @@
> {
> response = alertSourcesService.getAlertSources("Dojo");
> response.addCallbacks(getAlertSourcesCallback, errorCallback);
> +
> getAlerts();
> }
>
> @@ -102,7 +103,7 @@
>
> text = text + "<table>";
> text = text + "<TR CLASS='source_" + source.id + "' >";
> - text = text + " <TD CLASS='clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
> + text = text + " <TD CLASS='source_name clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
> text = text + " <IMG SRC='rss.png'/> " + source.name;
> text = text + " </TD>";
> text = text + " <TD CLASS='clickable link' ONCLICK=\"showEditSource('" + source.id + "')\">Edit</TD>";
> @@ -230,8 +231,10 @@
> {
> hideAddNewSource(sourceid);
> var source = getSource(sourceid);
> - alertSourcesService.addAlertSource(source);
> - getAlertSources();
> + alertSourcesService.addAlertSource(source);
> +
> + // wait a little before getting the list back from the server
> + setTimeout("getAlertSources()",1250);
> }
>
> function getSource(sourceid)
> @@ -311,7 +314,7 @@
>
> </script>
>
> - <h1 id="top">Apache Tuscany Feed Aggregator Sample</h1>
> + <h1 id="top">Apache Tuscany Alert Aggregator Demo</h1>
> <div id="errors"></div>
> <p>Alert Sources<span id="refreshSources"></span>:</p>
> <!--input type="button" value="getSources" onclick="getAlertSources()"/-->
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml Mon Jun 11 06:23:42 2007
> @@ -22,7 +22,7 @@
> Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
> <web-app>
>
> - <display-name>Tuscany Feed Aggregator Sample</display-name>
> + <display-name>Tuscany Alert Aggregator Demo</display-name>
>
> <listener>
> <listener-class>org.apache.tuscany.sca.webapp.TuscanyContextListener</listener-class>
> @@ -39,7 +39,7 @@
> </servlet-mapping>
>
> <welcome-file-list id="WelcomeFileList">
> - <welcome-file>FeedAggregator.html</welcome-file>
> + <welcome-file>AlertAggregator.html</welcome-file>
> </welcome-file-list>
>
> </web-app>
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/style.css Mon Jun 11 06:23:42 2007
> @@ -107,6 +107,11 @@
> display: none;
> }
>
> +.source_name
> +{
> +width: 600px;
> +}
> +
> .alert_text
> {
> width: 600px;
>
> Modified: incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java
> URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java?view=diff&rev=546141&r1=546140&r2=546141
> ==============================================================================
> --- incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java (original)
> +++ incubator/tuscany/java/sca/demos/alert-aggregator/src/test/java/org/apache/tuscany/sca/demos/aggregator/AlertsTestCase.java Mon Jun 11 06:23:42 2007
> @@ -17,7 +17,7 @@
> * under the License.
> */
>
> -package org.apache.tuscany.sca.samples.aggregator;
> +package org.apache.tuscany.sca.demos.aggregator;
>
> import java.io.ByteArrayInputStream;
>
> @@ -50,29 +50,30 @@
> protected void tearDown() {
> scaDomain.close();
> }
> -
> +
> +/* Use this if you want to test locally without deploying to a web container
> public void testWait() throws Exception {
> System.out.println("Feed aggregator server started (press enter to shutdown)");
> - // System.in.read();
> + System.in.read();
> System.out.println("Feed aggregator server stopped");
> }
> +*/
>
> - /*
> public void testGetAllNewAlerts() throws Exception {
> JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAllNewAlerts\",\"id\":2}");
> - JSONObject jsonResp = callService ("http://localhost:8080/AlertsServiceJSONRPC",
> + JSONObject jsonResp = callService ("http://localhost:8085/SCADomain/AlertsServiceJSONRPC",
> jsonRequest);
> - }
> + }
>
> public void testAddAlertSources() throws Exception {
> - JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.samples.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}");
> - JSONObject jsonResp = callService ("http://localhost:8080/AlertsSourcesServiceJSONRPC",
> + JSONObject jsonRequest = new JSONObject("{\"params\":[{\"name\":\"news\",\"id\":\"2\",\"address\":\"www.news.com\",\"feedAddress\":\"http://news.com.com/2547-1_3-0-20.xml\",\"feedType\":\"rss\",\"lastChecked\":\"lastChecked\",\"javaClass\":\"org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl\"}],\"method\":\"addAlertSource\",\"id\":2}");
> + JSONObject jsonResp = callService ("http://localhost:8085/SCADomain/AlertsSourcesServiceJSONRPC",
> jsonRequest);
> }
>
> - public void testGetAlertSources() throws Exception {
> + public void testGetAlertSources() throws Exception {
> JSONObject jsonRequest = new JSONObject("{\"params\":[\"sometext\"],\"method\":\"getAlertSources\",\"id\":2}");
> - JSONObject jsonResp = callService ("http://localhost:8080/SCADomain/AlertsSourcesServiceJSONRPC",
> + JSONObject jsonResp = callService ("http://localhost:8085/SCADomain/AlertsSourcesServiceJSONRPC",
> jsonRequest);
> assertEquals("BBC News", jsonResp.getJSONObject("result").getJSONObject("source").optJSONArray("list").getJSONObject(0).getString("name"));
> }
> @@ -87,5 +88,4 @@
> assertEquals(200, response.getResponseCode());
> return new JSONObject(response.getText());
> }
> - */
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
>
>
--
Jean-Sebastien
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org