You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/06/21 09:00:55 UTC

svn commit: r415929 [1/42] - in /incubator/tuscany/java: ./ das/rdb/ das/rdb/src/main/resources/META-INF/ sampleapps/ sampleapps/bigbank/account/ sampleapps/bigbank/account/src/main/resources/META-INF/ sampleapps/bigbank/webclient/ sampleapps/bigbank/w...

Author: jsdelfino
Date: Wed Jun 21 00:00:45 2006
New Revision: 415929

URL: http://svn.apache.org/viewvc?rev=415929&view=rev
Log:
Merged changes from the M1 branch into the head, changes in pom.xml files to generate the correct manifest files and package the correct license, notice and readme files in the JAR files

Added:
    incubator/tuscany/java/das/rdb/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/das/rdb/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/das/rdb/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sampleapps/bigbank/account/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/META-INF/
    incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sampleapps/bigbank/webclient/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/das/companyweb/src/main/resources/META-INF/
    incubator/tuscany/java/samples/das/companyweb/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/das/companyweb/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/das/companyweb/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/calculator/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/customerinfo/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworld-jms/client/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworld-jms/server/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworld/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworld/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworld/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworld/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworlde4xws/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworldjsclient/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldweb/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworldweb/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldweb/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworldweb/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworldws-celtix/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworldws/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/helloworldwsclient/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/
    incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/samples/sca/supplychain/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/bindings/binding.axis2/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/resources/META-INF/
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/bindings/binding.celtix/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/META-INF/
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/common/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/common/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/common/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/containers/container.java/src/main/resources/META-INF/
    incubator/tuscany/java/sca/containers/container.java/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/containers/container.java/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/containers/container.java/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/containers/container.rhino/src/main/resources/META-INF/
    incubator/tuscany/java/sca/containers/container.rhino/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/containers/container.rhino/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/containers/container.rhino/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/core/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/core/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/core/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/databinding/sdo/src/main/resources/META-INF/
    incubator/tuscany/java/sca/databinding/sdo/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/databinding/sdo/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/databinding/sdo/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/model/src/main/resources/META-INF/
    incubator/tuscany/java/sca/model/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/model/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/model/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/src/main/resources/
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/src/main/resources/META-INF/
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/src/main/resources/
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/src/main/resources/META-INF/
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/tomcat/src/main/resources/META-INF/
    incubator/tuscany/java/sca/tomcat/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/tomcat/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/tomcat/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sca/tools/src/main/resources/META-INF/
    incubator/tuscany/java/sca/tools/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sca/tools/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sca/tools/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sdo/impl/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sdo/impl/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sdo/impl/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sdo/plugin/src/main/resources/
    incubator/tuscany/java/sdo/plugin/src/main/resources/META-INF/
    incubator/tuscany/java/sdo/plugin/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sdo/plugin/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sdo/plugin/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/sdo/tools/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/sdo/tools/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/sdo/tools/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/spec/sca/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/spec/sca/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/spec/sca/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/spec/sdo/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/spec/sdo/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/spec/sdo/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/src/main/
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/src/main/resources/
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/src/main/resources/META-INF/
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/testing/tomcat/bigbank/src/main/
    incubator/tuscany/java/testing/tomcat/bigbank/src/main/resources/
    incubator/tuscany/java/testing/tomcat/bigbank/src/main/resources/META-INF/
    incubator/tuscany/java/testing/tomcat/bigbank/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/testing/tomcat/bigbank/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/testing/tomcat/bigbank/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/main/
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/main/resources/
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/main/resources/META-INF/
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/testing/tomcat/helloworldweb/src/main/resources/META-INF/README.txt   (with props)
    incubator/tuscany/java/testing/tomcat/helloworldws/src/main/
    incubator/tuscany/java/testing/tomcat/helloworldws/src/main/resources/
    incubator/tuscany/java/testing/tomcat/helloworldws/src/main/resources/META-INF/
    incubator/tuscany/java/testing/tomcat/helloworldws/src/main/resources/META-INF/LICENSE.txt   (with props)
    incubator/tuscany/java/testing/tomcat/helloworldws/src/main/resources/META-INF/NOTICE
    incubator/tuscany/java/testing/tomcat/helloworldws/src/main/resources/META-INF/README.txt   (with props)
Removed:
    incubator/tuscany/java/das/rdb/LICENSE.txt
    incubator/tuscany/java/das/rdb/README.txt
    incubator/tuscany/java/sampleapps/bigbank/account/LICENSE.txt
    incubator/tuscany/java/sampleapps/bigbank/account/README.txt
    incubator/tuscany/java/sampleapps/bigbank/webclient/LICENSE.txt
    incubator/tuscany/java/sampleapps/bigbank/webclient/README.txt
    incubator/tuscany/java/samples/das/companyweb/LICENSE.txt
    incubator/tuscany/java/samples/das/companyweb/README.txt
    incubator/tuscany/java/samples/sca/calculator/LICENSE.txt
    incubator/tuscany/java/samples/sca/calculator/README.txt
    incubator/tuscany/java/samples/sca/customerinfo/LICENSE.txt
    incubator/tuscany/java/samples/sca/customerinfo/README.txt
    incubator/tuscany/java/samples/sca/helloworld-jms/client/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworld-jms/client/README.txt
    incubator/tuscany/java/samples/sca/helloworld-jms/server/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworld-jms/server/README.txt
    incubator/tuscany/java/samples/sca/helloworld/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworld/README.txt
    incubator/tuscany/java/samples/sca/helloworlde4xws/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworlde4xws/README.txt
    incubator/tuscany/java/samples/sca/helloworldjsclient/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworldjsclient/README.txt
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworldjsonrpc/README.txt
    incubator/tuscany/java/samples/sca/helloworldweb/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworldweb/README.txt
    incubator/tuscany/java/samples/sca/helloworldws-celtix/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworldws-celtix/README.txt
    incubator/tuscany/java/samples/sca/helloworldws/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworldws/README.txt
    incubator/tuscany/java/samples/sca/helloworldwsclient/LICENSE.txt
    incubator/tuscany/java/samples/sca/helloworldwsclient/README.txt
    incubator/tuscany/java/samples/sca/supplychain/LICENSE.txt
    incubator/tuscany/java/samples/sca/supplychain/README.txt
    incubator/tuscany/java/sca/bindings/binding.axis2/LICENSE.txt
    incubator/tuscany/java/sca/bindings/binding.axis2/README.txt
    incubator/tuscany/java/sca/bindings/binding.celtix/LICENSE.txt
    incubator/tuscany/java/sca/bindings/binding.celtix/README.txt
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/LICENSE.txt
    incubator/tuscany/java/sca/bindings/binding.jsonrpc/README.txt
    incubator/tuscany/java/sca/common/LICENSE.txt
    incubator/tuscany/java/sca/common/README.txt
    incubator/tuscany/java/sca/containers/container.java/LICENSE.txt
    incubator/tuscany/java/sca/containers/container.java/README.txt
    incubator/tuscany/java/sca/containers/container.rhino/LICENSE.txt
    incubator/tuscany/java/sca/containers/container.rhino/README.txt
    incubator/tuscany/java/sca/core/LICENSE.txt
    incubator/tuscany/java/sca/core/README.txt
    incubator/tuscany/java/sca/databinding/sdo/LICENSE.txt
    incubator/tuscany/java/sca/databinding/sdo/README.txt
    incubator/tuscany/java/sca/model/LICENSE.txt
    incubator/tuscany/java/sca/model/README.txt
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/LICENSE.txt
    incubator/tuscany/java/sca/plugins/plugin.java2wsdl/README.txt
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/LICENSE.txt
    incubator/tuscany/java/sca/plugins/plugin.wsdl2java/README.txt
    incubator/tuscany/java/sca/tomcat/LICENSE.txt
    incubator/tuscany/java/sca/tomcat/README.txt
    incubator/tuscany/java/sca/tools/LICENSE.txt
    incubator/tuscany/java/sca/tools/README.txt
    incubator/tuscany/java/sdo/impl/LICENSE.txt
    incubator/tuscany/java/sdo/impl/README.txt
    incubator/tuscany/java/sdo/plugin/LICENSE.txt
    incubator/tuscany/java/sdo/plugin/README.txt
    incubator/tuscany/java/sdo/tools/LICENSE.txt
    incubator/tuscany/java/sdo/tools/README.txt
    incubator/tuscany/java/sdo/tools/src/main/resources/META-INF/MANIFEST.MF
    incubator/tuscany/java/spec/sca/LICENSE.txt
    incubator/tuscany/java/spec/sca/README.txt
    incubator/tuscany/java/spec/sdo/LICENSE.txt
    incubator/tuscany/java/spec/sdo/README.txt
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/LICENSE.txt
    incubator/tuscany/java/testing/interop/clients/webserviceInteropDoc/README.txt
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/LICENSE.txt
    incubator/tuscany/java/testing/interop/clients/webserviceSOAPRound2/README.txt
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/LICENSE.txt
    incubator/tuscany/java/testing/interop/clients/webserviceXSQ/README.txt
    incubator/tuscany/java/testing/tomcat/bigbank/LICENSE.txt
    incubator/tuscany/java/testing/tomcat/bigbank/README.txt
    incubator/tuscany/java/testing/tomcat/helloworldweb/LICENSE.txt
    incubator/tuscany/java/testing/tomcat/helloworldweb/README.txt
    incubator/tuscany/java/testing/tomcat/helloworldws/LICENSE.txt
    incubator/tuscany/java/testing/tomcat/helloworldws/README.txt
Modified:
    incubator/tuscany/java/LICENSE.txt
    incubator/tuscany/java/README.txt
    incubator/tuscany/java/das/rdb/src/main/resources/META-INF/MANIFEST.MF
    incubator/tuscany/java/pom.xml
    incubator/tuscany/java/sampleapps/pom.xml
    incubator/tuscany/java/samples/pom.xml
    incubator/tuscany/java/sdo/impl/pom.xml
    incubator/tuscany/java/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
    incubator/tuscany/java/spec/pom.xml
    incubator/tuscany/java/spec/sca/src/main/resources/META-INF/MANIFEST.MF
    incubator/tuscany/java/spec/sdo/src/main/resources/META-INF/MANIFEST.MF

Modified: incubator/tuscany/java/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/LICENSE.txt?rev=415929&r1=415928&r2=415929&view=diff
==============================================================================
--- incubator/tuscany/java/LICENSE.txt (original)
+++ incubator/tuscany/java/LICENSE.txt Wed Jun 21 00:00:45 2006
@@ -1025,38 +1025,38 @@
 
       1. Definitions.
 
-            1.1. ÒContributorÓ means each individual or entity that
+            1.1. "Contributor" means each individual or entity that
             creates or contributes to the creation of Modifications.
 
-            1.2. ÒContributor VersionÓ means the combination of the
+            1.2. "Contributor Version" means the combination of the
             Original Software, prior Modifications used by a
             Contributor (if any), and the Modifications made by that
             particular Contributor.
 
-            1.3. ÒCovered SoftwareÓ means (a) the Original Software, or
+            1.3. "Covered Software" means (a) the Original Software, or
             (b) Modifications, or (c) the combination of files
             containing Original Software with files containing
             Modifications, in each case including portions thereof.
 
-            1.4. ÒExecutableÓ means the Covered Software in any form
+            1.4. "Executable" means the Covered Software in any form
             other than Source Code. 
 
-            1.5. ÒInitial DeveloperÓ means the individual or entity
+            1.5. "Initial Developer" means the individual or entity
             that first makes Original Software available under this
             License. 
             
-            1.6. ÒLarger WorkÓ means a work which combines Covered
+            1.6. "Larger Work" means a work which combines Covered
             Software or portions thereof with code not governed by the
             terms of this License.
 
-            1.7. ÒLicenseÓ means this document.
+            1.7. "License" means this document.
 
-            1.8. ÒLicensableÓ means having the right to grant, to the
+            1.8. "Licensable" means having the right to grant, to the
             maximum extent possible, whether at the time of the initial
             grant or subsequently acquired, any and all of the rights
             conveyed herein.
             
-            1.9. ÒModificationsÓ means the Source Code and Executable
+            1.9. "Modifications" means the Source Code and Executable
             form of any of the following: 
 
                   A. Any file that results from an addition to,
@@ -1070,25 +1070,25 @@
                   C. Any new file that is contributed or otherwise made
                   available under the terms of this License.
 
-            1.10. ÒOriginal SoftwareÓ means the Source Code and
+            1.10. "Original Software" means the Source Code and
             Executable form of computer software code that is
             originally released under this License. 
 
-            1.11. ÒPatent ClaimsÓ means any patent claim(s), now owned
+            1.11. "Patent Claims" means any patent claim(s), now owned
             or hereafter acquired, including without limitation,
             method, process, and apparatus claims, in any patent
             Licensable by grantor. 
 
-            1.12. ÒSource CodeÓ means (a) the common form of computer
+            1.12. "Source Code" means (a) the common form of computer
             software code in which modifications are made and (b)
             associated documentation included in or with such code.
 
-            1.13. ÒYouÓ (or ÒYourÓ) means an individual or a legal
+            1.13. "You" (or "Your") means an individual or a legal
             entity exercising rights under, and complying with all of
-            the terms of, this License. For legal entities, ÒYouÓ
+            the terms of, this License. For legal entities, "You"
             includes any entity which controls, is controlled by, or is
             under common control with You. For purposes of this
-            definition, ÒcontrolÓ means (a) the power, direct or
+            definition, "control" means (a) the power, direct or
             indirect, to cause the direction or management of such
             entity, whether by contract or otherwise, or (b) ownership
             of more than fifty percent (50%) of the outstanding shares
@@ -1209,7 +1209,7 @@
 
             You may not offer or impose any terms on any Covered
             Software in Source Code form that alters or restricts the
-            applicable version of this License or the recipientsÕ
+            applicable version of this License or the recipients'
             rights hereunder. You may choose to offer, and to charge a
             fee for, warranty, support, indemnity or liability
             obligations to one or more recipients of Covered Software.
@@ -1231,7 +1231,7 @@
             different from this License, provided that You are in
             compliance with the terms of this License and that the
             license for the Executable form does not attempt to limit
-            or alter the recipientÕs rights in the Source Code form
+            or alter the recipient's rights in the Source Code form
             from the rights set forth in this License. If You
             distribute the Covered Software in Executable form under a
             different license, You must make it absolutely clear that
@@ -1290,7 +1290,7 @@
 
       5. DISCLAIMER OF WARRANTY.
 
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN ÒAS ISÓ
+      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
       BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
       INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
       SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
@@ -1315,7 +1315,7 @@
             6.2. If You assert a patent infringement claim (excluding
             declaratory judgment actions) against Initial Developer or
             a Contributor (the Initial Developer or Contributor against
-            whom You assert such claim is referred to as ÒParticipantÓ)
+            whom You assert such claim is referred to as "Participant")
             alleging that the Participant Software (meaning the
             Contributor Version where the Participant is a Contributor
             or the Original Software where the Participant is the
@@ -1351,7 +1351,7 @@
       COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
       INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
       LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTYÕS NEGLIGENCE TO THE EXTENT
+      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
       APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
       NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
       CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
@@ -1359,11 +1359,11 @@
 
       8. U.S. GOVERNMENT END USERS.
 
-      The Covered Software is a Òcommercial item,Ó as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of Òcommercial
-      computer softwareÓ (as that term is defined at 48 C.F.R. ¤
-      252.227-7014(a)(1)) and Òcommercial computer software
-      documentationÓ as such terms are used in 48 C.F.R. 12.212 (Sept.
+      The Covered Software is a "commercial item," as that term is
+      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+      computer software" (as that term is defined at 48 C.F.R. 
+      252.227-7014(a)(1)) and "commercial computer software
+      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
       1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
       through 227.7202-4 (June 1995), all U.S. Government End Users
       acquire Covered Software with only those rights set forth herein.
@@ -1380,12 +1380,12 @@
       governed by the law of the jurisdiction specified in a notice
       contained within the Original Software (except to the extent
       applicable law, if any, provides otherwise), excluding such
-      jurisdictionÕs conflict-of-law provisions. Any litigation
+      jurisdiction's conflict-of-law provisions. Any litigation
       relating to this License shall be subject to the jurisdiction of
       the courts located in the jurisdiction and venue specified in a
       notice contained within the Original Software, with the losing
       party responsible for costs, including, without limitation, court
-      costs and reasonable attorneysÕ fees and expenses. The
+      costs and reasonable attorneys' fees and expenses. The
       application of the United Nations Convention on Contracts for the
       International Sale of Goods is expressly excluded. Any law or
       regulation which provides that the language of a contract shall
@@ -1404,6 +1404,4 @@
       distribute such responsibility on an equitable basis. Nothing
       herein is intended or shall be deemed to constitute any admission
       of liability.
-
-===============================================================================
 

Modified: incubator/tuscany/java/README.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/README.txt?rev=415929&r1=415928&r2=415929&view=diff
==============================================================================
--- incubator/tuscany/java/README.txt (original)
+++ incubator/tuscany/java/README.txt Wed Jun 21 00:00:45 2006
@@ -19,7 +19,7 @@
 ---------------
 Documentation describing the system requirements and the steps to set up the
 Tuscany runtime and run the Tuscany basic technology samples can be found in
-GettingStarted.htm. Javadoc can be found in in the javadoc directory.
+GettingStarted.htm. Javadoc can be found in the javadoc directory.
 
 
 Thank you for using Tuscany!



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org