Author: rineholt
Date: Fri Sep 29 13:06:10 2006
New Revision: 451411
URL: http://svn.apache.org/viewvc?view=rev&rev=451411
Log:
moved scdl and fixed up server web.xml
Added:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl
(contents, props changed)
- copied, changed from r451231,
incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/sca/default.scdl
Removed:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/sca/default.scdl
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
Modified: incubator/tuscany/java/sampleapps/bigbank/account/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/pom.xml?view=diff&rev=451411&r1=451410&r2=451411
==============================================================================
--- incubator/tuscany/java/sampleapps/bigbank/account/pom.xml (original)
+++ incubator/tuscany/java/sampleapps/bigbank/account/pom.xml Fri Sep 29
13:06:10 2006
@@ -29,13 +29,15 @@
<name>Tuscany BigBank Account Module</name>
<description>BigBank Scenario - Account Management Module</description>
<dependencies>
+
+
<dependency>
<groupId>org.osoa</groupId>
<artifactId>sca-api-r${specVersion}</artifactId>
<version>${sca.version}</version>
<scope>compile</scope>
</dependency>
- <!-- java.xml.stream API -->
+ <!-- java.xml.stream API -->
<dependency>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
@@ -49,6 +51,17 @@
<version>3.0.1</version>
<scope>runtime</scope>
</dependency>
+
+
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>${sca.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.tuscany.das</groupId>
<artifactId>tuscany-das-rdb</artifactId>
@@ -164,6 +177,11 @@
<artifactId>databinding-sdo</artifactId>
<version>${sca.version}</version>
</dependency>
+ <dependency>
+
<groupId>org.apache.tuscany.sca.services.databinding</groupId>
+
<artifactId>databinding-axiom</artifactId>
+ <version>${sca.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca.services.bindings</groupId>
<artifactId>axis2</artifactId>
Copied:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl
(from r451231,
incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/sca/default.scdl)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=451411&p1=incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/sca/default.scdl&r1=451231&p2=incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl&r2=451411
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/sca/default.scdl
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl
Fri Sep 29 13:06:10 2006
@@ -48,7 +48,6 @@
<implementation.java
class="bigbank.account.services.accountdata.AccountDataServiceDASImpl"/>
</component>
-
<component name="AccountLoggerDataServiceComponent">
<implementation.java
class="bigbank.account.services.accountlogger.AccountLoggerDataServiceImpl"/>
Propchange:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/default.scdl
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml?view=diff&rev=451411&r1=451410&r2=451411
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/account/src/main/webapp/WEB-INF/web.xml
Fri Sep 29 13:06:10 2006
@@ -17,19 +17,48 @@
* specific language governing permissions and limitations
* under the License.
-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
- <display-name>Tuscany Bigbank Account sample</display-name>
+ <display-name>Tuscany Bigbank Account sample</display-name>
+
+ <!-- context-param>
+ <param-name>tuscany.systemScdlPath</param-name>
+ <param-value>/META-INF/tuscany/webapp.scdl</param-value>
+ </context-param -->
+
+ <!-- context-param>
+ <param-name>tuscany.applicationScdlPath</param-name>
+ <param-value>/META-INF/sca/default.scdl</param-value>
+ </context-param -->
+
+ <listener>
+
<listener-class>org.apache.tuscany.runtime.webapp.TuscanyContextListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>TuscanyServlet</servlet-name>
+ <display-name>Tuscany Servlet</display-name>
+
<servlet-class>org.apache.tuscany.runtime.webapp.TuscanyServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TuscanyServlet</servlet-name>
+ <url-pattern>/services/*</url-pattern>
+
+ </servlet-mapping>
<servlet>
<!-- Initialize bigbank database -->
<servlet-name>AccountDBInit</servlet-name>
<servlet-class>bigbank.account.services.accountdb.AccountDBInit</servlet-class>
<load-on-startup>2</load-on-startup>
</servlet>
- <servlet-mapping>
+ <!-- servlet-mapping>
<servlet-name>AccountDBInit</servlet-name>
<url-pattern>/AccountDBInit</url-pattern>
- </servlet-mapping>
-
+ </servlet-mapping -->
+
</web-app>
Modified:
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java?view=diff&rev=451411&r1=451410&r2=451411
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/java/bigbank/webclient/services/profile/LoginService.java
Fri Sep 29 13:06:10 2006
@@ -27,11 +27,11 @@
@DataType(name = "commonj.sdo.DataObject")
public interface LoginService {
- public static final int SUCCESS = 1;
+ static final int SUCCESS = 1;
- public static final int INVALID_LOGIN = -1;
+ static final int INVALID_LOGIN = -1;
- public static final int INVALID_PASSWORD = -2;
+ static final int INVALID_PASSWORD = -2;
- public int login(String userName, String password) throws RemoteException;
+ int login(String userName, String password) throws RemoteException;
}
Modified:
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl?view=diff&rev=451411&r1=451410&r2=451411
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/wsdl/AccountService.wsdl
Fri Sep 29 13:06:10 2006
@@ -460,7 +460,7 @@
<wsdl:port binding="account:AccountServiceSOAP"
name="AccountServiceSOAP">
<soap:address
-
location="http://localhost:8080/sample-bigbank-account/services/AccountService";
/>
+
location="http://localhost:8080/sample-bigbank-account-1.0-incubator-M2-SNAPSHOT/services/AccountService";
/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Modified:
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml?view=diff&rev=451411&r1=451410&r2=451411
==============================================================================
---
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/webapp/WEB-INF/web.xml
Fri Sep 29 13:06:10 2006
@@ -14,6 +14,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";>
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
<display-name>Tuscany Bigbank Web UI sample</display-name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
