You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/02/16 18:44:04 UTC
svn commit: r508520 - in /incubator/tuscany/java/sca/core-samples: ./
common/ common/calculator/ common/calculator/src/
common/calculator/src/main/java/calculator/
common/calculator/src/main/resources/META-INF/sca/ standalone/calculator/
standalone/cal...
Author: jboynes
Date: Fri Feb 16 09:44:02 2007
New Revision: 508520
URL: http://svn.apache.org/viewvc?view=rev&rev=508520
Log:
refactor calulator implementation to a separate module
partial webapp caluclator sample
Added:
incubator/tuscany/java/sca/core-samples/common/
incubator/tuscany/java/sca/core-samples/common/calculator/
- copied from r508286, incubator/tuscany/java/sca/core-samples/standalone/calculator/
incubator/tuscany/java/sca/core-samples/common/calculator/LICENSE.txt
- copied unchanged from r508509, incubator/tuscany/java/sca/core-samples/standalone/calculator/LICENSE.txt
incubator/tuscany/java/sca/core-samples/common/calculator/NOTICE.txt
- copied unchanged from r508509, incubator/tuscany/java/sca/core-samples/standalone/calculator/NOTICE.txt
incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml
- copied, changed from r508509, incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml
incubator/tuscany/java/sca/core-samples/common/calculator/readme.html
- copied unchanged from r508509, incubator/tuscany/java/sca/core-samples/standalone/calculator/readme.html
incubator/tuscany/java/sca/core-samples/common/calculator/src/
- copied from r508509, incubator/tuscany/java/sca/core-samples/standalone/calculator/src/
incubator/tuscany/java/sca/core-samples/common/pom.xml (with props)
incubator/tuscany/java/sca/core-samples/standalone/calculator/calculator-client.iml
Removed:
incubator/tuscany/java/sca/core-samples/common/calculator/src/main/java/calculator/CalculatorClient.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/AddService.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/AddServiceImpl.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorService.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/DivideService.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/DivideServiceImpl.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/MultiplyService.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/MultiplyServiceImpl.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/SubtractService.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/SubtractServiceImpl.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/test/
Modified:
incubator/tuscany/java/sca/core-samples/common/calculator/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/core-samples/pom.xml
incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml
incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl
incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/calc.jsp
Copied: incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml (from r508509, incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml?view=diff&rev=508520&p1=incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml&r1=508509&p2=incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/common/calculator/pom.xml Fri Feb 16 09:44:02 2007
@@ -20,13 +20,14 @@
<project>
<parent>
<groupId>org.apache.tuscany.sca.core-samples</groupId>
- <artifactId>standalone</artifactId>
+ <artifactId>common</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.core-samples.common</groupId>
<artifactId>calculator</artifactId>
<packaging>jar</packaging>
- <name>Apache Tuscany Calculator Sample</name>
+ <name>Apache Tuscany Calculator Common Composite</name>
<description>A sample Calculator made of several SCA components wired together.</description>
<dependencies>
@@ -43,10 +44,8 @@
<build>
<!-- requires install as this sample is also used by the webapp sample -->
<defaultGoal>install</defaultGoal>
- <finalName>${artifactId}</finalName>
- <!-- TODO Uncomment after launcher loader is added to the itest SCDL -->
- <!--plugins>
+ <plugins>
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-itest-plugin</artifactId>
@@ -58,6 +57,6 @@
</execution>
</executions>
</plugin>
- </plugins-->
+ </plugins>
</build>
</project>
Modified: incubator/tuscany/java/sca/core-samples/common/calculator/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/common/calculator/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=508520&r1=508509&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/common/calculator/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/core-samples/common/calculator/src/main/resources/META-INF/sca/default.scdl Fri Feb 16 09:44:02 2007
@@ -18,14 +18,8 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:launched="http://tuscany.apache.org/xmlns/sca/1.0"
name="CalculatorComposite">
- <component name="CalculatorClient">
- <launched:launched class="calculator.CalculatorClient"/>
- <reference name="calculatorService">CalculatorServiceComponent</reference>
- </component>
-
<component name="CalculatorServiceComponent">
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService">AddServiceComponent</reference>
Added: incubator/tuscany/java/sca/core-samples/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/common/pom.xml?view=auto&rev=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/common/pom.xml (added)
+++ incubator/tuscany/java/sca/core-samples/common/pom.xml Fri Feb 16 09:44:02 2007
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>core-samples</artifactId>
+ <version>1.0-incubator-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.tuscany.sca.core-samples</groupId>
+ <artifactId>common</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Tuscany Core Samples Common Composites</name>
+ <description>Common composites used by other Core Samples.</description>
+
+ <modules>
+ <module>calculator</module>
+ </modules>
+</project>
Propchange: incubator/tuscany/java/sca/core-samples/common/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/core-samples/common/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/core-samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/pom.xml?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/pom.xml Fri Feb 16 09:44:02 2007
@@ -32,7 +32,10 @@
<description>Sample projects that illustrate core concepts for SCA and Tuscany.</description>
<modules>
+ <module>common</module>
+<!--
<module>standalone</module>
+-->
<module>webapp</module>
</modules>
@@ -47,6 +50,12 @@
<artifactId>sca-api-r1.0</artifactId>
<version>1.0-incubator-SNAPSHOT</version>
<scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Added: incubator/tuscany/java/sca/core-samples/standalone/calculator/calculator-client.iml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/calculator/calculator-client.iml?view=auto&rev=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/calculator/calculator-client.iml (added)
+++ incubator/tuscany/java/sca/core-samples/standalone/calculator/calculator-client.iml Fri Feb 16 09:44:02 2007
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="calculator" />
+ <orderEntry type="library" name="junit-3.8.1" level="application" />
+ <orderEntry type="library" name="easymock-2.2" level="application" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/standalone/calculator/pom.xml Fri Feb 16 09:44:02 2007
@@ -26,13 +26,18 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>calculator</artifactId>
<packaging>jar</packaging>
- <name>Apache Tuscany Calculator Sample</name>
- <description>A sample Calculator made of several SCA components wired together.</description>
+ <name>Apache Tuscany Calculator Client Sample</name>
+ <description>A sample Calculator that runs from the command line.</description>
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r1.0</artifactId>
+ <groupId>org.apache.tuscany.sca.core-samples.common</groupId>
+ <artifactId>calculator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -41,23 +46,6 @@
</dependencies>
<build>
- <!-- requires install as this sample is also used by the webapp sample -->
- <defaultGoal>install</defaultGoal>
<finalName>${artifactId}</finalName>
-
- <!-- TODO Uncomment after launcher loader is added to the itest SCDL -->
- <!--plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins-->
</build>
</project>
Modified: incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java (original)
+++ incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/java/calculator/CalculatorClient.java Fri Feb 16 09:44:02 2007
@@ -27,7 +27,7 @@
public class CalculatorClient {
private CalculatorService calculatorService;
-
+
@Reference
public void setCalculatorService(CalculatorService calculatorService) {
this.calculatorService = calculatorService;
Modified: incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl (original)
+++ incubator/tuscany/java/sca/core-samples/standalone/calculator/src/main/resources/META-INF/sca/default.scdl Fri Feb 16 09:44:02 2007
@@ -21,33 +21,12 @@
xmlns:launched="http://tuscany.apache.org/xmlns/sca/1.0"
name="CalculatorComposite">
+ <include name="CalculatorComposite"/>
+<!--
<component name="CalculatorClient">
<launched:launched class="calculator.CalculatorClient"/>
<reference name="calculatorService">CalculatorServiceComponent</reference>
</component>
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService">AddServiceComponent</reference>
- <reference name="subtractService">SubtractServiceComponent</reference>
- <reference name="multiplyService">MultiplyServiceComponent</reference>
- <reference name="divideService">DivideServiceComponent</reference>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
+-->
</composite>
Modified: incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/pom.xml Fri Feb 16 09:44:02 2007
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.core-samples</groupId>
+ <groupId>org.apache.tuscany.sca.core-samples.common</groupId>
<artifactId>calculator</artifactId>
<version>${project.version}</version>
</dependency>
Modified: incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/default.scdl Fri Feb 16 09:44:02 2007
@@ -20,7 +20,17 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
name="CalculatorComposite">
+<!--
<component name="CalculatorComponent">
<implementation.composite name="CalculatorComposite" jarLocation="lib/calculator-1.0-incubator-SNAPSHOT.jar"/>
+ </component>
+-->
+
+ <!-- config that includes the calculator composite -->
+ <include name="CalculatorComposite" scdlResource="META-INF/sca/default.scdl"/>
+
+ <component name="webcalc">
+ <implementation.java class="calculator.CalculatorClient"/>
+ <reference name="calculatorService">CalculatorServiceComponent</reference>
</component>
</composite>
Modified: incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/web.xml?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/WEB-INF/web.xml Fri Feb 16 09:44:02 2007
@@ -29,16 +29,12 @@
<welcome-file>calc.jsp</welcome-file>
</welcome-file-list>
- <filter>
- <filter-name>TuscanyFilter</filter-name>
- <filter-class>org.apache.tuscany.runtime.webapp.TuscanyFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>TuscanyFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
<listener>
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
</listener>
+
+ <context-param>
+ <param-name>tuscany.component</param-name>
+ <param-value>webcalc</param-value>
+ </context-param>
</web-app>
Modified: incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/calc.jsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/calc.jsp?view=diff&rev=508520&r1=508519&r2=508520
==============================================================================
--- incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/calc.jsp (original)
+++ incubator/tuscany/java/sca/core-samples/webapp/webcalc/src/main/webapp/calc.jsp Fri Feb 16 09:44:02 2007
@@ -1,6 +1,6 @@
<%@ page import="calculator.CalculatorService" %>
-<%@ page import="org.osoa.sca.CompositeContext" %>
-<%@ page import="org.osoa.sca.CurrentCompositeContext" %>
+<%@ page import="org.osoa.sca.ComponentContext" %>
+<%@ page import="org.apache.tuscany.runtime.webapp.Constants" %>
<%--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,11 +21,11 @@
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%
- CompositeContext context = CurrentCompositeContext.getContext();
- CalculatorService calc = context.locateService(CalculatorService.class, "CalculatorServiceComponent");
+ ComponentContext context = (ComponentContext) application.getAttribute(Constants.CONTEXT_ATTRIBUTE);
+ CalculatorService calc = context.getService(CalculatorService.class, "calculatorService");
%>
<html>
-<head><title>Calculator sample</title></head>
+<head><title>Calculator Sample</title></head>
<body>
<table>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org