You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by av...@apache.org on 2010/06/08 08:03:35 UTC

svn commit: r952563 - in /incubator/photark/trunk: ./ photark-jcr/ photark-security/ photark-security/src/main/webapp/ photark-ui-security/ photark-ui-security/src/ photark-ui-security/src/main/ photark-ui-security/src/main/webapp/ photark-ui-security/...

Author: avd
Date: Tue Jun  8 08:03:34 2010
New Revision: 952563

URL: http://svn.apache.org/viewvc?rev=952563&view=rev
Log:
refactored photark-security module and created a new photark-ui-security module which holds the security UI.

Added:
    incubator/photark/trunk/photark-security/DISCLAIMER
    incubator/photark/trunk/photark-security/LICENSE
    incubator/photark/trunk/photark-security/NOTICE
    incubator/photark/trunk/photark-ui-security/
    incubator/photark/trunk/photark-ui-security/DISCLAIMER
    incubator/photark/trunk/photark-ui-security/LICENSE
    incubator/photark/trunk/photark-ui-security/NOTICE
    incubator/photark/trunk/photark-ui-security/pom.xml
    incubator/photark/trunk/photark-ui-security/src/
    incubator/photark/trunk/photark-ui-security/src/main/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/WEB-INF/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/WEB-INF/web.xml
    incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html
    incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/aol.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/blogger.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/claimid.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/flickr.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/google.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/lj.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/myopenid.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/openid.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/technorati.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/verisign.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vidoop.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vox.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/yahoo.ico   (with props)
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/js/
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/js/login.js
    incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html
Removed:
    incubator/photark/trunk/photark-security/src/main/webapp/
Modified:
    incubator/photark/trunk/photark-jcr/pom.xml
    incubator/photark/trunk/photark-security/pom.xml
    incubator/photark/trunk/photark-webapp/pom.xml
    incubator/photark/trunk/pom.xml

Modified: incubator/photark/trunk/photark-jcr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/pom.xml?rev=952563&r1=952562&r2=952563&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/pom.xml (original)
+++ incubator/photark/trunk/photark-jcr/pom.xml Tue Jun  8 08:03:34 2010
@@ -34,6 +34,11 @@
 			<artifactId>photark</artifactId>
 			<version>1.0-incubating-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.photark</groupId>
+			<artifactId>photark-security</artifactId>
+			<version>1.0-incubating-SNAPSHOT</version>
+		</dependency>
 
         <!-- Tuscany Dependencies -->
 		<dependency>

Added: incubator/photark/trunk/photark-security/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/DISCLAIMER?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-security/DISCLAIMER (added)
+++ incubator/photark/trunk/photark-security/DISCLAIMER Tue Jun  8 08:03:34 2010
@@ -0,0 +1,7 @@
+Apache PhotArk is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Added: incubator/photark/trunk/photark-security/LICENSE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/LICENSE?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-security/LICENSE (added)
+++ incubator/photark/trunk/photark-security/LICENSE Tue Jun  8 08:03:34 2010
@@ -0,0 +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.
+
+
+

Added: incubator/photark/trunk/photark-security/NOTICE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/NOTICE?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-security/NOTICE (added)
+++ incubator/photark/trunk/photark-security/NOTICE Tue Jun  8 08:03:34 2010
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2008 - 2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Modified: incubator/photark/trunk/photark-security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-security/pom.xml?rev=952563&r1=952562&r2=952563&view=diff
==============================================================================
--- incubator/photark/trunk/photark-security/pom.xml (original)
+++ incubator/photark/trunk/photark-security/pom.xml Tue Jun  8 08:03:34 2010
@@ -26,8 +26,8 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>photark-security</artifactId>
-	<packaging>war</packaging>
-	<name>Apache PhotArk Security</name>
+	<packaging>jar</packaging>
+	<name>Apache PhotArk Security Services</name>
 
 	<dependencies>
 		<dependency>

Added: incubator/photark/trunk/photark-ui-security/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/DISCLAIMER?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/DISCLAIMER (added)
+++ incubator/photark/trunk/photark-ui-security/DISCLAIMER Tue Jun  8 08:03:34 2010
@@ -0,0 +1,7 @@
+Apache PhotArk is an effort undergoing incubation at The Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is
+required of all newly accepted projects until a further review indicates that
+the infrastructure, communications, and decision making process have stabilized
+in a manner consistent with other successful ASF projects. While incubation
+status is not necessarily a reflection of the completeness or stability of the
+code, it does indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Added: incubator/photark/trunk/photark-ui-security/LICENSE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/LICENSE?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/LICENSE (added)
+++ incubator/photark/trunk/photark-ui-security/LICENSE Tue Jun  8 08:03:34 2010
@@ -0,0 +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.
+
+
+

Added: incubator/photark/trunk/photark-ui-security/NOTICE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/NOTICE?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/NOTICE (added)
+++ incubator/photark/trunk/photark-ui-security/NOTICE Tue Jun  8 08:03:34 2010
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2008 - 2009 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: incubator/photark/trunk/photark-ui-security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/pom.xml?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/pom.xml (added)
+++ incubator/photark/trunk/photark-ui-security/pom.xml Tue Jun  8 08:03:34 2010
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.photark</groupId>
+		<artifactId>photark-parent</artifactId>
+		<version>1.0-incubating-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>photark-ui-security</artifactId>
+	<packaging>war</packaging>
+	<name>Apache PhotArk Security UI</name>
+
+	<build>
+		<finalName>${artifactId}</finalName>
+	</build>
+
+</project>

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/WEB-INF/web.xml?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/WEB-INF/web.xml (added)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/WEB-INF/web.xml Tue Jun  8 08:03:34 2010
@@ -0,0 +1,29 @@
+<?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.    
+-->
+
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xmlns="http://java.sun.com/xml/ns/javaee" 
+         xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
+         id="WebApp_ID" version="2.5">
+
+  <display-name>PhotArk photo gallery web application security resources</display-name>
+
+</web-app>

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html (added)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/error.html Tue Jun  8 08:03:34 2010
@@ -0,0 +1,54 @@
+<!--
+    * 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.
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Super Admin Login</title>
+	<style type="text/css">
+	    #container {
+	      padding: 1em;      
+	    }
+	</style>
+   </head>
+   <body>
+	<div id="container">
+  <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+     <div><span><a href="../">Gallery</a></span></div>
+  </div>
+    <div style="clear:both"></div>
+    <div style="color:red;font-size:1.4em">&nbsp; The username or password you entered is incorrect. </div>
+    <p>Login as <span style="color:green">Super Admin</span></p>
+    <form method="post" action="j_security_check">
+      <table cellspacing="3">
+        <tr>
+          <th align="right">Username:</th>
+          <td align="left"><input type="text" name="j_username"/></td>
+        </tr>
+        <tr>
+          <th align="right">Password:</th>
+          <td align="left"><input type="password" name="j_password"/></td>
+        </tr>
+        <tr>
+          <th align="right">&nbsp;</th>
+          <td align="left"><input type="submit" value="Log In"/></td>
+        </tr>
+      </table>
+    </form>
+  </body>
+</html>
\ No newline at end of file

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html (added)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/admin/login.html Tue Jun  8 08:03:34 2010
@@ -0,0 +1,53 @@
+<!--
+    * 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.
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Super Admin Login</title>
+<style type="text/css">
+    #container {
+      padding: 1em;      
+    }
+</style>
+</head>
+<body>
+<div id="container">
+  <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+     <div><span><a href="../">Gallery</a></span></div>
+  </div>
+  <div style="clear:both"></div>
+   <p>Login as <span style="color:green">Super Admin</span></p>
+    <form method="post" action="j_security_check">
+      <table cellspacing="3">
+        <tr>
+          <th align="right">Username:</th>
+          <td align="left"><input type="text" name="j_username"/></td>
+        </tr>
+        <tr>
+          <th align="right">Password:</th>
+          <td align="left"><input type="password" name="j_password"/></td>
+        </tr>
+        <tr>
+          <th align="right">&nbsp;</th>
+          <td align="left"><input type="submit" value="Log In"/></td>
+        </tr>
+      </table>
+    </form>
+  </body>
+</html>
\ No newline at end of file

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html (added)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/home/error.html Tue Jun  8 08:03:34 2010
@@ -0,0 +1,70 @@
+  <!--
+    * 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.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Login</title>
+
+ <script type="text/javascript" src="js/login.js"></script>
+
+<style type="text/css">
+    #container {
+      padding: 1em;      
+    }
+    
+    #container p {
+      font-size: 1.2em;
+      font-family: Tahoma,Verdana;
+    }
+    
+    #openid_identifier {
+      background-image: url(images/openid.ico);
+      background-position: 3px 2px;
+      background-repeat: no-repeat;
+      margin: 0;
+      padding: 0.2em 0.2em 0.2em 20px;
+      vertical-align: middle;
+      width: 400px;
+    }
+</style>
+</head>
+<body onload="initOpenIDPage();">
+<div id="container">
+  <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+     <div><span><a href="../">Gallery</a></span></div>
+  </div>
+  <div style="clear:both"></div>
+   <div style="color:red;font-size:1.4em">&nbsp; Your openid could not be resolved.</div>
+  <p>Login with your <span style="color:orange">openid</span></p>
+  <form method="POST">
+    <input id="openid_identifier" name="openid_identifier" type="text" size=80/>
+    <input class="btn" type="submit" value="send"/>
+  </form>
+  <br>
+   <div style="float:left;font-size:0.8em;text-align:left;">
+   <div id="provider_space" style="width:430px"></div>
+     
+  <!-- <p><span style="color:green;font-size:1em">https://www.google.com/accounts/o8/id</span><span> for google accounts</span></p>
+  <p>or enter <span style="color:green;font-size:1em">your_username@gmail.com</span></p> -->
+  </div>
+ 
+  </div>
+</body>
+</html>
+  
\ No newline at end of file

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/aol.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/aol.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/aol.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/blogger.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/blogger.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/blogger.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/claimid.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/claimid.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/claimid.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/flickr.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/flickr.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/flickr.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/google.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/google.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/google.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/lj.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/lj.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/lj.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/myopenid.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/myopenid.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/myopenid.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/openid.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/openid.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/openid.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/technorati.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/technorati.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/technorati.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/verisign.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/verisign.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/verisign.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vidoop.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vidoop.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vidoop.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vox.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vox.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/vox.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/yahoo.ico
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/yahoo.ico?rev=952563&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/images/yahoo.ico
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/js/login.js
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/js/login.js?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/home/js/login.js (added)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/home/js/login.js Tue Jun  8 08:03:34 2010
@@ -0,0 +1,117 @@
+/*
+ * 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.
+ */
+
+
+
+var provider= [	[["Google","google",,,"https://www.google.com/accounts/o8/id",""],["Yahoo!","yahoo",,,"http://yahoo.com/",""],["AOL","aol","http://openid.aol.com/",,,"America Online/AIM screenname:"]],
+				[["Blogger","blogger","http://",".blogspot.com/",,"Google Blogger blog name:"],["Flickr","flickr",,,"http://www.flickr.com/",""],["Livejournal","lj","http://",".livejournal.com/",,"Livejournal username:"]],
+				[["myOpenID","myopenid","http://",".myopenid.com/",,"myOpenID username:"],["Verisign","verisign","http://",".pip.verisignlabs.com/",,"Verisign PIP username:"],["Vidoop","vidoop","http://",".myvidoop.com/",,"Vidoop username:"]],
+				[["claimID","claimid","http://claimid.com/",,,"claimID username:"],["Technorati","technorati","http://technorati.com/people/technorati/",,,"Technorati username:"],["Vox","vox","http://",".vox.com/",,"Vox username:"]],
+				[["Other OpenID","openid",,,"http://",]]
+			  ];
+
+var bgcolor = "#ffffff";
+var change_color = "#A4D1AA"
+var active_color= "#42A44F";
+
+var active_cell=null;
+var active_cell_row=null;
+var active_cell_col=null;
+var username="username";
+var openid_input=null;
+var input_info="";
+
+function initOpenIDPage(){
+openid_input=document.getElementById("openid_identifier");
+providerSpace=document.getElementById("provider_space");
+username_input="<span style=\"color:green;font-size:1em\">Sign in using;</span><br><div id=\"input_space\" style=\"float: right;\">"+input_info+"<input id =\"input_field\"type=\"text\" size=\"20\" style=\"vertical-align: middle; padding: 2px 2px 2px 20px; background-repeat: no-repeat; background-position: 2px 2px; background-image: url(&quot;images/"+provider[4][0][1]+".ico&quot;);\" onchange=\"enter_username(this);\"onkeyup=\"enter_username(this);\" value=\"username\"></input></div><br>";
+provider_table= "<table border=\"0\" style=\"background-color: rgb(224,238,238); width: 100%; border: 0 solid rgb(110, 145, 175);\">";
+for(var i =0; i<4;i++){
+provider_table+="<tr>";
+for(var j =0; j<3;j++){
+provider_table+="<td style=\"background-color: rgb(255,255,255);font-weight: bold; padding: 4px; vertical-align: middle; cursor: pointer;\" onclick=\"click(this,"+i+","+j+")\" onmouseover=\"mover(this);\"  onmouseout=\"mout(this);\"><img src=\"images/"+provider[i][j][1]+".ico\" style=\"width: 16px; height: 16px; vertical-align: middle;\">"+provider[i][j][0]+"</td>";
+}
+provider_table+="</tr>";
+}
+provider_table+="<tr>\
+				<td colspan=\"3\" style=\"background-color: rgb(255,255,255);font-weight: bold; padding: 4px; vertical-align: middle; cursor: pointer;\" onclick=\"click(this,"+4+","+0+")\" onmouseover=\"mover(this);\"  onmouseout=\"mout(this);\"><img src=\"images/"+provider[4][0][1]+".ico\" style=\"width: 16px; height: 16px; vertical-align: middle;\">"+provider[4][0][0]+"</td>\
+				</tr>\
+				</table>";
+
+providerSpace.innerHTML=username_input+provider_table;
+document.getElementById("input_space").style.display = "none";
+};
+
+function click(cell,row,col) {
+	active_cell_row=row;
+	active_cell_col=col;
+	
+	if (active_cell!==null){
+		active_cell.style.backgroundColor = bgcolor;
+	}
+	
+	cell.style.backgroundColor = active_color;
+	active_cell=cell;
+	
+document.getElementById("input_space").innerHTML=provider[active_cell_row][active_cell_col][5]+"<input id =\"input_field\" type=\"text\" size=\"20\" style=\"vertical-align: middle; padding: 2px 2px 2px 20px; background-repeat: no-repeat; background-position: 2px 2px; background-image: url(&quot;images/"+provider[active_cell_row][active_cell_col][1]+".ico&quot;);\" onchange=\"enter_username(this);\"onkeyup=\"enter_username(this);\" value="+username+"></input>";
+	if(provider[row][col][4]!=undefined){
+		openid_input.value=provider[row][col][4];
+		document.getElementById("input_space").style.display = "none";
+		document.getElementById("openid_identifier").focus();
+	}else {
+		formet_input_name(row,col);
+		document.getElementById("input_space").style.display = "";	
+		document.getElementById("input_field").focus();
+    	document.getElementById("input_field").select();	
+	}
+	
+
+	
+};
+
+function formet_input_name(row,col){
+		if(provider[row][col][2]!=undefined){
+			openid_input.value=provider[row][col][2];
+		}
+		if(username!=""){
+		openid_input.value+=username;
+		}else {
+		openid_input.value+="username";
+		}
+		if(provider[row][col][3]!=undefined){
+			openid_input.value+=provider[row][col][3];
+		}
+};
+
+function mover(cell) {
+	if(cell!==active_cell){
+		cell.style.backgroundColor = change_color;
+	}
+};
+
+function mout(cell) {
+	if(cell!==active_cell){
+	 	cell.style.backgroundColor = bgcolor;
+	}
+};
+
+function enter_username(cell){
+	username=cell.value;
+    formet_input_name(active_cell_row,active_cell_col);
+};
\ No newline at end of file

Added: incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html?rev=952563&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html (added)
+++ incubator/photark/trunk/photark-ui-security/src/main/webapp/home/login.html Tue Jun  8 08:03:34 2010
@@ -0,0 +1,69 @@
+<!--
+    * 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.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<title>Login</title>
+
+ <script type="text/javascript" src="js/login.js"></script>
+
+<style type="text/css">
+    #container {
+      padding: 1em;      
+    }
+    
+    #container p {
+      font-size: 1.2em;
+      font-family: Tahoma,Verdana;
+    }
+    
+    #openid_identifier {
+      background-image: url(images/openid.ico);
+      background-position: 3px 2px;
+      background-repeat: no-repeat;
+      margin: 0;
+      padding: 0.2em 0.2em 0.2em 20px;
+      vertical-align: middle;
+      width: 400px;
+    }
+</style>
+</head>
+<body onload="initOpenIDPage();">
+<div id="container">
+  <div style="float:right;width:50%;font-size:0.8em;text-align:right;">
+     <div><span><a href="../">Gallery</a></span></div>
+  </div>
+  <div style="clear:both"></div>
+ <!--  <div style="color:red;font-size:1.4em">&nbsp; Your openid could not be resolved.</div>-->
+  <p>Login with your <span style="color:orange">openid</span></p>
+  <form method="POST">
+    <input id="openid_identifier" name="openid_identifier" type="text" size=80/>
+    <input class="btn" type="submit" value="send"/>
+  </form>
+  <br>
+   <div style="float:left;font-size:0.8em;text-align:left;">
+   <div id="provider_space" style="width:430px"></div>
+     
+  <!-- <p><span style="color:green;font-size:1em">https://www.google.com/accounts/o8/id</span><span> for google accounts</span></p>
+  <p>or enter <span style="color:green;font-size:1em">your_username@gmail.com</span></p> -->
+  </div>
+ 
+  </div>
+</body>
+</html>

Modified: incubator/photark/trunk/photark-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/pom.xml?rev=952563&r1=952562&r2=952563&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/pom.xml (original)
+++ incubator/photark/trunk/photark-webapp/pom.xml Tue Jun  8 08:03:34 2010
@@ -66,7 +66,7 @@
 		
 		<dependency>
 			<groupId>org.apache.photark</groupId>
-			<artifactId>photark-security</artifactId>
+			<artifactId>photark-ui-security</artifactId>
 			<version>1.0-incubating-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>

Modified: incubator/photark/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/pom.xml?rev=952563&r1=952562&r2=952563&view=diff
==============================================================================
--- incubator/photark/trunk/pom.xml (original)
+++ incubator/photark/trunk/pom.xml Tue Jun  8 08:03:34 2010
@@ -192,11 +192,12 @@
             </activation>
             <modules>
                 <module>photark</module>
+                <module>photark-security</module>
                 <module>photark-filesystem</module>                
                 <module>photark-jcr</module>
-				<module>photark-security</module>
                 <module>photark-ui</module>
                 <module>photark-ui-admin</module>
+                <module>photark-ui-security</module>
                 <module>photark-appengine-webapp</module>                
                 <module>photark-webapp</module>
             </modules>
@@ -210,11 +211,12 @@
             <modules>
                 <module>distribution</module>
                 <module>photark</module>
+                <module>photark-security</module>
                 <module>photark-filesystem</module>                
                 <module>photark-jcr</module>
-				<module>photark-security</module>
                 <module>photark-ui</module>
                 <module>photark-ui-admin</module>
+                <module>photark-ui-security</module>
                 <module>photark-appengine-webapp</module>                
                 <module>photark-webapp</module>
             </modules>
@@ -228,11 +230,12 @@
             <modules>
                 <module>distribution</module>
                 <module>photark</module>
+                <module>photark-security</module>
                 <module>photark-filesystem</module>                
                 <module>photark-jcr</module>
-				<module>photark-security</module>
                 <module>photark-ui</module>
                 <module>photark-ui-admin</module>
+                <module>photark-ui-security</module>
                 <module>photark-ui-test</module>                
                 <module>photark-appengine-webapp</module>                
                 <module>photark-webapp</module>