tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r830026 [5/6] - in /tuscany/branches/sca-java-1.x: ./ demos/alert-aggregator-webapp/ distribution/bundle/ distribution/manifest/ distribution/src/main/assembly/ distribution/src/main/release/ distribution/src/main/release/bin/ distribution/...
Date Mon, 26 Oct 2009 23:45:08 GMT
Modified: tuscany/branches/sca-java-1.x/modules/policy-security-http/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security-http/LICENSE?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-security-http/LICENSE (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-security-http/LICENSE Mon Oct 26 23:44:59 2009
@@ -1,205 +1,205 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+

Modified: tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationCallbackHandler.java Mon Oct 26 23:44:59 2009
@@ -46,7 +46,7 @@
         BasicAuthenticationPrincipal principal =  SecurityUtil.getPrincipal(subject, BasicAuthenticationPrincipal.class);
 
         if (principal != null){
-            /*
+        	/*
             System.out.println(">>> LDAPRealmAuthenticationCallbackHandler" +
                                " Username: " + principal.getName() + 
                                " Password: " + principal.getPassword());

Modified: tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationPolicyProviderFactory.java Mon Oct 26 23:44:59 2009
@@ -41,8 +41,8 @@
         
         LDAPSecurityHandlerExtensionPoint securityHandlerExtensionPoint = registry.getExtensionPoint(LDAPSecurityHandlerExtensionPoint.class);
         if (securityHandlerExtensionPoint.getLDAPSecurityHandlers().size() > 0) {
-            securityHandler = securityHandlerExtensionPoint.getLDAPSecurityHandlers().get(0);
-         }
+           securityHandler = securityHandlerExtensionPoint.getLDAPSecurityHandlers().get(0);
+        }
     }
 
     public Class<LDAPRealmAuthenticationPolicy> getModelType() {

Modified: tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/LDAPRealmAuthenticationServicePolicyProvider.java Mon Oct 26 23:44:59 2009
@@ -213,7 +213,7 @@
         
         return polices;
     }
-
+    
     /**
      * Find a given configured operation
      * @param operation

Modified: tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/extensibility/DefaultLDAPSecurityExtensionPoint.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/extensibility/DefaultLDAPSecurityExtensionPoint.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/extensibility/DefaultLDAPSecurityExtensionPoint.java (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-security-http/src/main/java/org/apache/tuscany/sca/policy/security/http/extensibility/DefaultLDAPSecurityExtensionPoint.java Mon Oct 26 23:44:59 2009
@@ -32,7 +32,6 @@
 import org.apache.tuscany.sca.monitor.MonitorFactory;
 import org.apache.tuscany.sca.monitor.Problem;
 import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.monitor.impl.ProblemImpl;
 
 
 /**
@@ -87,7 +86,7 @@
     */
     private void error(String message, Object model, Exception ex) {
         if (monitor != null) {
-            Problem problem = new ProblemImpl(this.getClass().getName(), null, Severity.ERROR, model, message, ex);
+            Problem problem = monitor.createProblem(this.getClass().getName(), null, Severity.ERROR, model, message, ex);
             monitor.problem(problem);
         }        
     }

Modified: tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java (original)
+++ tuscany/branches/sca-java-1.x/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/authentication/basic/BasicAuthenticationServicePolicyInterceptor.java Mon Oct 26 23:44:59 2009
@@ -27,7 +27,6 @@
 import org.apache.tuscany.sca.invocation.Message;
 import org.apache.tuscany.sca.policy.PolicySet;
 import org.apache.tuscany.sca.policy.SecurityUtil;
-import org.osoa.sca.ServiceRuntimeException;
 
 
 /**
@@ -52,7 +51,14 @@
     }
 
     private void init() {
-
+        if (policySet != null) {
+            for (Object policyObject : policySet.getPolicies()){
+                if (policyObject instanceof BasicAuthenticationPolicy){
+                    policy = (BasicAuthenticationPolicy)policyObject;
+                    break;
+                }
+            }
+        }
     }
 
     public Message invoke(Message msg) {
@@ -60,35 +66,17 @@
         Subject subject = SecurityUtil.getSubject(msg);
         BasicAuthenticationPrincipal principal =  SecurityUtil.getPrincipal(subject, 
                                                                             BasicAuthenticationPrincipal.class);
-        boolean authenticated = false;
-        
+
         if (principal != null){
             
-            System.out.println("Authenticating user: " + 
-                               principal.getName());
+            System.out.println("Username: " + 
+                               principal.getName() + 
+                               " Password: " + 
+                               principal.getPassword());
             
             // could call out here to some 3rd party system to do whatever you 
-            // need to do do with username and password. For this very simple
-            // interceptor just check that the credentials match crendentials in 
-            // the policy
-            
-            if (policySet != null) {
-                for (Object policyObject : policySet.getPolicies()){
-                    if (policyObject instanceof BasicAuthenticationPolicy){
-                        BasicAuthenticationPolicy policy = (BasicAuthenticationPolicy)policyObject;
-                        
-                        if (policy.getUserName().equals(principal.getName())){
-                            if (policy.getPassword().equals(principal.getPassword())){
-                                authenticated = true;
-                            }
-                        } 
-                    }
-                }
-            }
-        }
-        
-        if (authenticated == false){
-            throw new ServiceRuntimeException("User: " + principal.getName() + " cannot be authenticated");
+            // need to do do with username and password
+           
         }
     
         return getNext().invoke(msg);

Modified: tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE (original)
+++ tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/NOTICE Mon Oct 26 23:44:59 2009
@@ -8,3 +8,4 @@
 "New" BSD License (see the LICENSE file contained in this distribution) under the 
 following copyright
  Copyright (c) 2005, The Dojo Foundation. All rights reserved.
+

Modified: tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/build-dojo.xml Mon Oct 26 23:44:59 2009
@@ -74,7 +74,7 @@
             <patternset>
                 <include name="dojo-release-${dojo.version}/dojo/**"/>
                 <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
-                <include name="dojo-release-${dojo.version}/dijit/**"/>
+                <exclude name="dojo-release-${dojo.version}/dijit/**"/>
                 <exclude name="dojo-release-${dojo.version}/dojox/**"/>
                 <exclude name="dojo-release-${dojo.version}/util/**"/>
             </patternset>

Modified: tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/pom.xml Mon Oct 26 23:44:59 2009
@@ -30,14 +30,6 @@
     <name>Apache Tuscany SCA Web JavaScript for DOJO</name>
 
     <dependencies>
-
-        <dependency>
-            <groupId>org.dojotoolkit</groupId>
-            <artifactId>dojo</artifactId>
-            <version>1.3.0</version>
-            <type>zip</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core</artifactId>
@@ -81,8 +73,8 @@
 			        </dependency>
 			    </dependencies>
                 <executions>
-                    <execution> 
-                        <id>install-dojo</id>                       
+                    <execution>
+                        <id>install-dojo</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>run</goal>
@@ -94,7 +86,7 @@
                                 </ant>
                             </tasks>
                         </configuration>
-                    </execution>                
+                    </execution>
                     <execution>
                         <id>copy-dojo-files</id>
                         <phase>generate-resources</phase>

Modified: tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java (original)
+++ tuscany/branches/sca-java-1.x/modules/web-javascript-dojo/src/main/java/org/apache/tuscany/sca/web/javascript/dojo/DojoModuleActivator.java Mon Oct 26 23:44:59 2009
@@ -69,7 +69,7 @@
 
     public void stop(ExtensionPointRegistry registry) {
         Servlet servlet = servletHost.getServletMapping(dojoBaseUri);
-        if(servlet == null) {
+        if(servlet != null) {
             servletHost.removeServletMapping(dojoBaseUri);
             servletHost.removeServletMapping(dojoUri);
 

Modified: tuscany/branches/sca-java-1.x/modules/workspace-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/workspace-impl/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/workspace-impl/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/workspace-impl/pom.xml Mon Oct 26 23:44:59 2009
@@ -55,16 +55,10 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution-namespace</artifactId>
             <version>1.6-SNAPSHOT</version>
             <scope>test</scope>
-        </dependency>   
+        </dependency>
         
     </dependencies>
 

Modified: tuscany/branches/sca-java-1.x/modules/workspace/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/workspace/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/workspace/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/workspace/pom.xml Mon Oct 26 23:44:59 2009
@@ -29,12 +29,6 @@
     <name>Apache Tuscany SCA Domain Workspace Model</name>
 
     <dependencies>
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-contribution</artifactId>

Modified: tuscany/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java (original)
+++ tuscany/branches/sca-java-1.x/modules/workspace/src/main/java/org/apache/tuscany/sca/workspace/impl/WorkspaceFactoryImpl.java Mon Oct 26 23:44:59 2009
@@ -30,7 +30,7 @@
  */
 public class WorkspaceFactoryImpl implements WorkspaceFactory {
     
-    public WorkspaceFactoryImpl() {
+    protected WorkspaceFactoryImpl() {
     }
     
     public Workspace createWorkspace() {

Modified: tuscany/branches/sca-java-1.x/modules/xsd/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/xsd/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/xsd/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/xsd/pom.xml Mon Oct 26 23:44:59 2009
@@ -7,15 +7,15 @@
  * 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.    
+ * under the License.
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
@@ -39,6 +39,12 @@
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
             <version>1.4.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xalan</groupId>
+                    <artifactId>xalan</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/branches/sca-java-1.x/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/pom.xml Mon Oct 26 23:44:59 2009
@@ -86,6 +86,17 @@
             </snapshots>
         </repository>
         <repository>
+            <id>apache.repository</id>
+            <name>Apache Repository</name>
+            <url>https://repository.apache.org/content/groups/snapshots</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
             <id>indiana</id>
             <url>http://ftp.ussg.iu.edu/eclipse/modeling/emf/emf/maven2/</url>
             <releases>
@@ -104,7 +115,17 @@
            <snapshots>
                <enabled>false</enabled>
            </snapshots>
-        </repository>        
+        </repository>  
+        <repository>
+            <id>ibiblio</id>
+            <url>http://mirrors.ibiblio.org/pub/mirrors/maven2/</url>
+           <releases>
+               <enabled>true</enabled>
+           </releases>
+           <snapshots>
+               <enabled>false</enabled>
+           </snapshots>
+        </repository>       
     </repositories>
 
     <pluginRepositories>
@@ -156,6 +177,16 @@
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
+
+        <!-- Java download repository -->
+        <pluginRepository>
+            <id>java download</id>
+            <name>Java Download Repository</name>
+            <url>http://download.java.net/maven/2</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
     </pluginRepositories>
 
     <distributionManagement>

Modified: tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/samples/binding-echo-extension/src/main/java/echo/impl/EchoBindingProcessor.java Mon Oct 26 23:44:59 2009
@@ -6,15 +6,15 @@
  * 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.
+ * under the License.    
  */
 
 package echo.impl;

Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/pom.xml Mon Oct 26 23:44:59 2009
@@ -7,15 +7,15 @@
     * 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.    
+    * under the License.
 -->
 <project>
     <modelVersion>4.0.0</modelVersion>
@@ -90,7 +90,7 @@
             <version>1.6-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -142,6 +142,21 @@
                             <goal>generate</goal>
                         </goals>
                     </execution>
+                   <execution>
+                        <id>generate-helloworld-sdo1</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <schemaFile>${basedir}/src/main/resources/test.xsd</schemaFile>
+                            <javaPackage>model.sdo</javaPackage>
+                            <prefix>Entity</prefix>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noUnsettable>true</noUnsettable>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>

Added: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java?rev=830026&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java (added)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java Mon Oct 26 23:44:59 2009
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package services.bcircle;
+
+import model.sdo.EntityFactory;
+import model.sdo.Laboratory;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class BioTestCase {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        BiochemicalCircle biochemicalCircl = new BiochemicalCircleImpl();
+        Laboratory lab2 = biochemicalCircl.getLaboratory("Lab2"); //This invocation without use SCA works ok.
+
+        SCADomain scaDomain = SCADomain.newInstance("resources/clinicalLaboratory.composite");
+        BiochemicalCircle biochemicalCircle =
+            scaDomain.getService(BiochemicalCircle.class, "BiochemicalCircleComponent");
+        Laboratory lab = EntityFactory.INSTANCE.createLaboratory();
+        lab.setName("lab2");
+        biochemicalCircle.setLaboratory(lab); // this invocation works ok too
+
+        lab = biochemicalCircle.getLaboratory("Lab2"); // here I have an exception posted below.
+
+        //here I wait a moment before close scaDomain
+        System.out.println(lab.getName());
+
+        scaDomain.close();
+
+    }
+}

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java?rev=830026&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java (added)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java Mon Oct 26 23:44:59 2009
@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package services.bcircle;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface BiochemicalCircle {
+    void setLaboratory(model.sdo.Laboratory lab);
+
+    model.sdo.Laboratory getLaboratory(String name);
+}

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java?rev=830026&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java (added)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java Mon Oct 26 23:44:59 2009
@@ -0,0 +1,40 @@
+/*
+ * 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.
+ */
+
+package services.bcircle;
+import model.sdo.EntityFactory;
+import model.sdo.Laboratory;
+
+import org.osoa.sca.annotations.Service;
+
+
+@Service(BiochemicalCircle.class)
+public class BiochemicalCircleImpl implements BiochemicalCircle{
+   public Laboratory getLaboratory(String name) {
+
+      Laboratory lab = EntityFactory.INSTANCE.createLaboratory();
+      lab.setName("Main Laboratory");
+      return lab;
+   }
+
+   public void setLaboratory(Laboratory lab) {
+      //sad method
+      System.out.println(lab.getName());
+   }
+}

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml?rev=830026&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml (added)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml Mon Oct 26 23:44:59 2009
@@ -0,0 +1,23 @@
+<?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.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+  xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+  <tuscany:sdo.types namespace="http://helloworld" location="wsdl/helloworld.wsdl"/>
+</contribution>

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite?rev=830026&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite (added)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite Mon Oct 26 23:44:59 2009
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sca:composite xmlns:federation="http://eclipse.org/SCAExample1/src/resources/federation"
+    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" name="clinicalLaboratory"
+    targetNamespace="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory">
+
+    <sca:component name="BiochemicalCircleComponent">
+        <sca:implementation.java class="services.bcircle.BiochemicalCircleImpl" />
+        <sca:service name="BiochemicalCircle">
+            <sca:interface.java interface="services.bcircle.BiochemicalCircle" />
+            <sca:binding.ws uri="http://localhost:8080/SCA1/MyServiceComponent" />
+        </sca:service>
+    </sca:component>
+    <!--
+    <sca:service name="BiochemicalCircle" promote="BiochemicalCircleComponent/BiochemicalCircle" />
+     -->
+</sca:composite>

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/test.xsd
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/test.xsd?rev=830026&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/test.xsd (added)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/test.xsd Mon Oct 26 23:44:59 2009
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory"
+    xmlns:tns="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory"
+    elementFormDefault="qualified">
+    <complexType name="Practice">
+        <sequence>
+            <element name="name" type="string" />
+        </sequence>
+    </complexType>
+    <complexType name="Laboratory">
+        <sequence>
+            <element name="name" type="string" />
+            <element name="practices" type="tns:Practice" maxOccurs="unbounded" />
+        </sequence>
+    </complexType>
+</schema>

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/test.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/branches/sca-java-1.x/samples/helloworld-ws-sdo/src/main/resources/test.xsd
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/java/helloworld/HelloWorldServer.java Mon Oct 26 23:44:59 2009
@@ -33,7 +33,7 @@
         BrokerService jmsBroker = new BrokerService();
         jmsBroker.setPersistent(false);
         jmsBroker.setUseJmx(false);
-        jmsBroker.addConnector("tcp://localhost:61613");
+        jmsBroker.addConnector("tcp://localhost:61619");
         jmsBroker.start();
         return jmsBroker;
     }

Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/main/resources/helloworldwsjms.composite Mon Oct 26 23:44:59 2009
@@ -28,7 +28,7 @@
 	    <service name="HelloWorldService">
 	        <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
             <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapJmsBinding)"
-                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:51293"/>
+                    uri="jms:/queue.sample?transport.jms.ConnectionFactoryJNDIName=QueueConnectionFactory&amp;java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:61619"/>
             <!-- binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"/ -->
         </service>
     </component>

Modified: tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/samples/helloworld-ws-service-jms/src/test/java/helloworld/HelloWorldJmsServerTestCase.java Mon Oct 26 23:44:59 2009
@@ -48,7 +48,7 @@
         jmsBroker = new BrokerService(); 
         jmsBroker.setPersistent(false);
         jmsBroker.setUseJmx(false);
-        jmsBroker.addConnector("tcp://localhost:51293");
+        jmsBroker.addConnector("tcp://localhost:61619");
         jmsBroker.start();
     }
     

Modified: tuscany/branches/sca-java-1.x/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java (original)
+++ tuscany/branches/sca-java-1.x/samples/implementation-pojo-extension/src/main/java/pojo/impl/POJOImplementationProcessor.java Mon Oct 26 23:44:59 2009
@@ -6,15 +6,15 @@
  * 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.
+ * under the License.    
  */
 package pojo.impl;
 
@@ -48,25 +48,25 @@
 
 /**
  * Implements a STAX based artifact processor for POJO implementations.
- *
+ * 
  * The artifact processor is responsible for processing <implementation.pojo>
  * elements in SCA assembly XML composite files and populating the POJO
  * implementation model, resolving its references to other artifacts in the SCA
- * contribution, and optionally write the model back to SCA assembly XML.
+ * contribution, and optionally write the model back to SCA assembly XML. 
  */
 public class POJOImplementationProcessor implements StAXArtifactProcessor<POJOImplementation> {
     private static final QName IMPLEMENTATION_POJO = new QName("http://pojo", "implementation.pojo");
-
+    
     private AssemblyFactory assemblyFactory;
     private JavaInterfaceFactory javaFactory;
     private POJOImplementationFactory pojoImplementationFactory;
     private PolicyFactory policyFactory;
     private PolicyAttachPointProcessor policyProcessor;
-
+    
     public POJOImplementationProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-
+        
         // Get the assembly and Java interface factories as we'll need them to
-        // create model objects
+        // create model objects 
         assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
         javaFactory = modelFactories.getFactory(JavaInterfaceFactory.class);
         policyFactory = modelFactories.getFactory(PolicyFactory.class);
@@ -85,36 +85,36 @@
     }
 
     public POJOImplementation read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-
+    
         // Read an <implementation.pojo> element
         POJOImplementation implementation = pojoImplementationFactory.createPOJOImplementation();
-
+        
         // Read policies
         policyProcessor.readPolicies(implementation, reader);
-
+        
         // Read the POJO class attribute.
         String className = reader.getAttributeValue(null, "class");
         implementation.setPOJOName(className);
-
+        
         // Mark the POJO model unresolved to track the fact that it's not
         // completely initialized, its class is not loaded yet and services
         // and references not initialized either
         implementation.setUnresolved(true);
-
+        
         // Skip to end element
         while (reader.hasNext()) {
             if (reader.next() == END_ELEMENT && IMPLEMENTATION_POJO.equals(reader.getName())) {
                 break;
             }
         }
-
+        
         return implementation;
     }
 
     public void resolve(POJOImplementation implementation, ModelResolver resolver) throws ContributionResolveException {
-
+        
         // Resolve the POJO implementation
-
+        
         // First resolve its class
         ClassReference classReference = new ClassReference(implementation.getPOJOName());
         classReference = resolver.resolveModel(ClassReference.class, classReference);
@@ -123,21 +123,21 @@
             throw new ContributionResolveException("Class could not be resolved: " + implementation.getPOJOName());
         }
         implementation.setPOJOClass(pojoClass);
-
+        
         // Check to see if we have a .componentType file describing the POJO class
         ComponentType componentType = assemblyFactory.createComponentType();
         componentType.setUnresolved(true);
         componentType.setURI(implementation.getURI() + ".componentType");
         componentType = resolver.resolveModel(ComponentType.class, componentType);
         if (!componentType.isUnresolved()) {
-
+            
             // We have a component type description, merge it into the POJO model
             implementation.getServices().addAll(componentType.getServices());
             implementation.getReferences().addAll(componentType.getReferences());
             implementation.getProperties().addAll(componentType.getProperties());
-
+            
         } else {
-
+            
             // We have no component type description, simply introspect the POJO and
             // create a single Service for it
             Service service = assemblyFactory.createService();
@@ -153,21 +153,21 @@
             service.setInterfaceContract(interfaceContract);
             implementation.getServices().add(service);
         }
-
+        
         // Mark the implementation resolved now
         implementation.setUnresolved(false);
     }
 
     public void write(POJOImplementation implementation, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
+        
         // Write <implementation.pojo> element
         writer.writeStartElement(IMPLEMENTATION_POJO.getNamespaceURI(), IMPLEMENTATION_POJO.getLocalPart());
         policyProcessor.writePolicyAttributes(implementation, writer);
-
+        
         if (implementation.getPOJOName() != null) {
             writer.writeAttribute("class", implementation.getPOJOName());
         }
-
+        
         writer.writeEndElement();
     }
 }

Modified: tuscany/branches/sca-java-1.x/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite (original)
+++ tuscany/branches/sca-java-1.x/samples/quote-xquery/src/main/resources/xqueryquotewsclient.composite Mon Oct 26 23:44:59 2009
@@ -18,7 +18,9 @@
     * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" targetNamespace="http://quote.xquery/client"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0" xmlns:xq="http://quote.xquery/client"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" 
+    xmlns:xq="http://quote.xquery/client"
     name="xqueryquotewsclient">
 
     <component name="QuoteJoinLocalComponent">
@@ -101,9 +103,8 @@
     </component>
 
     <reference name="availQuoteProvider" promote="QuoteJoinExternalReferencesComponent/availQuoteProvider">
-        <!-- removed because it doesn't work with TUSCANY-2324 fix
+        <!-- removed because it doesn't work with TUSCANY-2324 fix -->
         <interface.java interface="xquery.quote.AvailQuoteProviderService" />
-        -->
         <binding.ws wsdlElement="http://quote.xquery#wsdl.port(AvailQuoteProviderService/AvailQuoteProviderSoapPort)" />
     </reference>
     <reference name="quoteJoinWs" promote="QuoteJoinLocalComponent/quoteJoinWs">

Modified: tuscany/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/samples/quote-xquery/src/test/java/xquery/quote/XQueryQuoteClientTestCase.java Mon Oct 26 23:44:59 2009
@@ -33,7 +33,6 @@
 import org.example.quote.QuoteResponse;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import commonj.sdo.DataObject;
@@ -63,7 +62,6 @@
  *    total price 
  *  4. SDO is used for data interchange
  */
-@Ignore("Broken, see TUSCANY-2943")
 public class XQueryQuoteClientTestCase {
 
     public static boolean SHOW_DEBUG_MSG = false;

Modified: tuscany/branches/sca-java-1.x/samples/simple-bigbank-spring/README
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/simple-bigbank-spring/README?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/simple-bigbank-spring/README (original)
+++ tuscany/branches/sca-java-1.x/samples/simple-bigbank-spring/README Mon Oct 26 23:44:59 2009
@@ -1,6 +1,11 @@
 Spring Bigbank Sample
 ======================
-This sample is made of 3 modules that represent the different aspects of a fictitious banking application.
+This sample is different from the simple-bigbank in that it is made of 4 separate modules that represent the different aspects of a fictitious banking application.
+
+simple-bigbank-spring (this module)
+spring-bigbank-calculator
+spring-bigbank-checkaccount
+spring-bigbank-stockquote
 
 To run the simple-bigbank-spring sample you need to first run spring-bigbank-calculator, spring-bigbank-checkaccount and spring-bigbank-stockquote composites. 
 This will bring up Tuscany runtime and load the three applications and make them available as services.

Modified: tuscany/branches/sca-java-1.x/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite (original)
+++ tuscany/branches/sca-java-1.x/samples/spring-bigbank-stockquote/src/main/resources/StockQuote.composite Mon Oct 26 23:44:59 2009
@@ -25,7 +25,7 @@
     
     <service name="StockQuoteService" promote="StockQuoteServiceComponent">
         <interface.java interface="bigbank.stockquote.StockQuoteService"/>
-        <binding.ws uri="http://localhost:8085/services/StockQuoteWebService"/>
+        <binding.ws uri="http://localhost:8081/services/StockQuoteWebService"/>
     </service>
 
     <component name="StockQuoteServiceComponent">

Modified: tuscany/branches/sca-java-1.x/samples/store-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-webapp/pom.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-webapp/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/store-webapp/pom.xml Mon Oct 26 23:44:59 2009
@@ -103,6 +103,23 @@
     
     <build>
        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.6-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
+                        </configuration>                    
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>           
+        </plugins>
     </build>
 
 </project>

Modified: tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml (original)
+++ tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/META-INF/sca-contribution.xml Mon Oct 26 23:44:59 2009
@@ -1,23 +1,23 @@
-<?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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:store="http://store">
-   <deployable composite="store:store"/>
+<?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.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:store="http://store">
+   <deployable composite="store:store"/>
 </contribution>
\ No newline at end of file

Modified: tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/store.html
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/store.html?rev=830026&r1=830025&r2=830026&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/store.html (original)
+++ tuscany/branches/sca-java-1.x/samples/store-webapp/src/main/webapp/store.html Mon Oct 26 23:44:59 2009
@@ -1,162 +1,162 @@
-<!--
-    * 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.    
--->
-<html>
-<head>
-<title>Store</title>
-
-<script type="text/javascript" src="store.js"></script>
-
-<script language="JavaScript">
-
-	//@Reference
-	var catalog = new tuscany.sca.Reference("catalog");
-	
-	//@Reference
-	var shoppingCart = new tuscany.sca.Reference("shoppingCart");
-
-	//@Reference
-	var shoppingTotal = new tuscany.sca.Reference("shoppingTotal");
-	
-	var catalogItems;
-
-	function catalog_getResponse(items,exception) {
-		if(exception){
-			alert(exception.message);
-			return;
-		}
-		var catalog = "";
-		
-			for (var i=0; i<items.length; i++) {
-				var item = items[i].name + ' - ' + items[i].price;
-				catalog += '<input name="items" type="checkbox" value="' + 
-							item + '">' + item + ' <br>';
-			}
-			document.getElementById('catalog').innerHTML=catalog;
-			catalogItems = items;
-	}
-	
-	function shoppingCart_getResponse(feed) {
-		if (feed != null) {
-			var entries = feed.getElementsByTagName("entry"); 
-			var list = "";
-			for (var i=0; i<entries.length; i++) {
-				var content = entries[i].getElementsByTagName("content")[0];
-				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
-				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
-				list += name + ' - ' + price + ' <br>';
-			}
-			document.getElementById("shoppingCart").innerHTML = list;
-
-			if (entries.length != 0) {			
-					try	{
-						shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
-					}
-					catch(e){
-						alert(e);
-					}
-			}
-		}
-	}
-	
-	function shoppingTotal_getTotalResponse(total,exception) {
-		if(exception) { 
-			alert(exception.message); 
-			return;
-		}
-		document.getElementById('total').innerHTML = total;
-	}
-	
-	function shoppingCart_postResponse(entry) {
-		shoppingCart.get("", shoppingCart_getResponse);
-	}				
-
-	function addToCart() {
-		var items  = document.catalogForm.items;
-		var j = 0;
-		for (var i=0; i<items.length; i++)
-			if (items[i].checked) {
-					
-				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
-                	'<Item xmlns="http://services/">' +
-                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
-                 	'</Item>' + '</content></entry>';
-				shoppingCart.post(entry, shoppingCart_postResponse);
-				items[i].checked = false;
-			}
-	}
-	function checkoutCart() {
-		document.getElementById('store').innerHTML='<h2>' +
-				'Thanks for Shopping With Us!</h2>'+
-				'<h2>Your Order</h2>'+
-				'<form name="orderForm">'+
-					document.getElementById('shoppingCart').innerHTML+
-					'<br>'+
-					document.getElementById('total').innerHTML+
-					'<br>'+
-					'<br>'+
-					'<input type="submit" value="Continue Shopping">'+ 
-				'</form>';
-		shoppingCart.del("", null);
-	}
-	function deleteCart() {
-		shoppingCart.del("", null);
-		document.getElementById('shoppingCart').innerHTML = "";
-		document.getElementById('total').innerHTML = "";	
-	}	
-
-	function init() {
-			
-			try	{
-				catalog.get(catalog_getResponse);
-				shoppingCart.get("", shoppingCart_getResponse);
-			}
-			catch(e){
-				alert(e);
-			}
-		}
-	
-</script>
-
-</head>
-
-<body onload="init()">
-<h1>Store</h1>
-  <div id="store">
-   	<h2>Catalog</h2>
-   	<form name="catalogForm">
-		<div id="catalog" ></div>
-		<br>
-		<input type="button" onClick="addToCart()"  value="Add to Cart">
-   	</form>
- 
- 	<br>
-  
-   	<h2>Your Shopping Cart</h2>
-   	<form name="shoppingCartForm">
-		<div id="shoppingCart"></div>
-		<br>
-		<div id="total"></div>
-		<br>		
-		<input type="button" onClick="checkoutCart()" value="Checkout"> 
-		<input type="button" onClick="deleteCart()" value="Empty">     
-	   	<a href="../ShoppingCart/Cart/">(feed)</a>
-	</form>    
-  </div>
-</body>
-</html>
+<!--
+    * 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.    
+-->
+<html>
+<head>
+<title>Store</title>
+
+<script type="text/javascript" src="store.js"></script>
+
+<script language="JavaScript">
+
+	//@Reference
+	var catalog = new tuscany.sca.Reference("catalog");
+	
+	//@Reference
+	var shoppingCart = new tuscany.sca.Reference("shoppingCart");
+
+	//@Reference
+	var shoppingTotal = new tuscany.sca.Reference("shoppingTotal");
+	
+	var catalogItems;
+
+	function catalog_getResponse(items,exception) {
+		if(exception){
+			alert(exception.message);
+			return;
+		}
+		var catalog = "";
+		
+			for (var i=0; i<items.length; i++) {
+				var item = items[i].name + ' - ' + items[i].price;
+				catalog += '<input name="items" type="checkbox" value="' + 
+							item + '">' + item + ' <br>';
+			}
+			document.getElementById('catalog').innerHTML=catalog;
+			catalogItems = items;
+	}
+	
+	function shoppingCart_getResponse(feed) {
+		if (feed != null) {
+			var entries = feed.getElementsByTagName("entry"); 
+			var list = "";
+			for (var i=0; i<entries.length; i++) {
+				var content = entries[i].getElementsByTagName("content")[0];
+				var name = content.getElementsByTagName("name")[0].firstChild.nodeValue;
+				var price = content.getElementsByTagName("price")[0].firstChild.nodeValue;
+				list += name + ' - ' + price + ' <br>';
+			}
+			document.getElementById("shoppingCart").innerHTML = list;
+
+			if (entries.length != 0) {			
+					try	{
+						shoppingTotal.getTotal(shoppingTotal_getTotalResponse);
+					}
+					catch(e){
+						alert(e);
+					}
+			}
+		}
+	}
+	
+	function shoppingTotal_getTotalResponse(total,exception) {
+		if(exception) { 
+			alert(exception.message); 
+			return;
+		}
+		document.getElementById('total').innerHTML = total;
+	}
+	
+	function shoppingCart_postResponse(entry) {
+		shoppingCart.get("", shoppingCart_getResponse);
+	}				
+
+	function addToCart() {
+		var items  = document.catalogForm.items;
+		var j = 0;
+		for (var i=0; i<items.length; i++)
+			if (items[i].checked) {
+					
+				var entry = '<entry xmlns="http://www.w3.org/2005/Atom"><title>item</title><content type="text/xml">' +
+                	'<Item xmlns="http://services/">' +
+                	'<name xmlns="">' + catalogItems[i].name + '</name>' + '<price xmlns="">' + catalogItems[i].price + '</price>' +
+                 	'</Item>' + '</content></entry>';
+				shoppingCart.post(entry, shoppingCart_postResponse);
+				items[i].checked = false;
+			}
+	}
+	function checkoutCart() {
+		document.getElementById('store').innerHTML='<h2>' +
+				'Thanks for Shopping With Us!</h2>'+
+				'<h2>Your Order</h2>'+
+				'<form name="orderForm">'+
+					document.getElementById('shoppingCart').innerHTML+
+					'<br>'+
+					document.getElementById('total').innerHTML+
+					'<br>'+
+					'<br>'+
+					'<input type="submit" value="Continue Shopping">'+ 
+				'</form>';
+		shoppingCart.del("", null);
+	}
+	function deleteCart() {
+		shoppingCart.del("", null);
+		document.getElementById('shoppingCart').innerHTML = "";
+		document.getElementById('total').innerHTML = "";	
+	}	
+
+	function init() {
+			
+			try	{
+				catalog.get(catalog_getResponse);
+				shoppingCart.get("", shoppingCart_getResponse);
+			}
+			catch(e){
+				alert(e);
+			}
+		}
+	
+</script>
+
+</head>
+
+<body onload="init()">
+<h1>Store</h1>
+  <div id="store">
+   	<h2>Catalog</h2>
+   	<form name="catalogForm">
+		<div id="catalog" ></div>
+		<br>
+		<input type="button" onClick="addToCart()"  value="Add to Cart">
+   	</form>
+ 
+ 	<br>
+  
+   	<h2>Your Shopping Cart</h2>
+   	<form name="shoppingCartForm">
+		<div id="shoppingCart"></div>
+		<br>
+		<div id="total"></div>
+		<br>		
+		<input type="button" onClick="checkoutCart()" value="Checkout"> 
+		<input type="button" onClick="deleteCart()" value="Empty">     
+	   	<a href="../ShoppingCart/Cart/">(feed)</a>
+	</form>    
+  </div>
+</body>
+</html>



Mime
View raw message