diff options
Diffstat (limited to '')
3 files changed, 6 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml index cc4ba525a1..bce29ad874 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml @@ -22,9 +22,9 @@ <parent>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
- </parent><version>1.0-SNAPSHOT</version>
+ </parent><version>2.0-SNAPSHOT</version>
<artifactId>scatours-contribution-currency-servlet</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Tours Currency Converter Servlet Contribution</name>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java index 3584ebbb93..465c667f0b 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java @@ -26,8 +26,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.osoa.sca.ComponentContext; -import org.osoa.sca.annotations.Reference; +import org.oasisopen.sca.ComponentContext; +import org.oasisopen.sca.annotation.Reference; import com.tuscanyscatours.currencyconverter.CurrencyConverter; @@ -43,7 +43,7 @@ public class CurrencyConverterServlet extends HttpServlet { // annotation in containers supporting SCA "deep" integration. In other // environments in can be looked up from the ComponentContext. ComponentContext context = - (ComponentContext)config.getServletContext().getAttribute("org.osoa.sca.ComponentContext"); + (ComponentContext)config.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext"); currencyConverter = context.getService(CurrencyConverter.class, "currencyConverter"); } } diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite index c9ef16ee1b..ce73eb15aa 100644 --- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite +++ b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite @@ -17,7 +17,7 @@ * specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
targetNamespace="http://scatours.com"
name="CurrencyConverterServlet">
|