Author: fmoga
Date: Thu Jun 9 08:37:15 2011
New Revision: 1133716
URL: http://svn.apache.org/viewvc?rev=1133716&view=rev
Log:
Minor modifications to the comet samples.
Modified:
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
Modified:
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html?rev=1133716&r1=1133715&r2=1133716&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
(original)
+++
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/pubsub-webapp/src/main/webapp/index.html
Thu Jun 9 08:37:15 2011
@@ -35,8 +35,7 @@
document.getElementById('connect').onclick =
function(event) {
/* transport can be : long-polling or streaming */
SCA.TuscanyComet.connect(document.getElementById('transport').value);
- document.getElementById('connect').disabled = true;
- document.getElementById('transport').disabled = true;
+ document.getElementById('connect').value = 'Switch';
}
Modified:
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java?rev=1133716&r1=1133715&r2=1133716&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
(original)
+++
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepository.java
Thu Jun 9 08:37:15 2011
@@ -25,6 +25,6 @@ import org.oasisopen.sca.annotation.Remo
@Remotable
public interface CountryRepository {
- List<Country> getStartingWith(String text);
+ List<Country> findStartingWith(String text);
}
Modified:
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java?rev=1133716&r1=1133715&r2=1133716&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
(original)
+++
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryRepositoryImpl.java
Thu Jun 9 08:37:15 2011
@@ -25,9 +25,7 @@ import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import org.oasisopen.sca.ComponentContext;
import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Context;
import org.oasisopen.sca.annotation.EagerInit;
import org.oasisopen.sca.annotation.Init;
import org.oasisopen.sca.annotation.Property;
@@ -39,9 +37,6 @@ import org.oasisopen.sca.annotation.Serv
@Service(CountryRepository.class)
public class CountryRepositoryImpl implements CountryRepository {
- @Context
- protected ComponentContext context;
-
private String fileName;
private List<Country> countries;
@@ -70,7 +65,7 @@ public class CountryRepositoryImpl imple
}
@Override
- public List<Country> getStartingWith(String text) {
+ public List<Country> findStartingWith(String text) {
List<Country> result = new ArrayList<Country>();
for (Country c : countries) {
if (c.getName().toLowerCase().startsWith(text.toLowerCase())) {
Modified:
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java?rev=1133716&r1=1133715&r2=1133716&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
(original)
+++
tuscany/sca-java-2.x/contrib/samples/learning-more/binding-comet/single-response-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/CountryServiceImpl.java
Thu Jun 9 08:37:15 2011
@@ -26,11 +26,11 @@ import org.oasisopen.sca.annotation.Serv
@Service(CountryService.class)
public class CountryServiceImpl implements CountryService {
- @Reference
- protected CountryRepository repository;
+ @Reference
+ protected CountryRepository repository;
- @Override
- public List<Country> getCountriesStartingWith(String text) {
- return repository.getStartingWith(text);
- }
+ @Override
+ public List<Country> getCountriesStartingWith(String text) {
+ return repository.findStartingWith(text);
+ }
}