You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ec...@apache.org on 2008/04/08 08:41:00 UTC

svn commit: r645776 [6/9] - in /geronimo/samples/branches/1.1: ./ migration-ejb-bmp/ migration-ejb-bmp/config/ migration-ejb-bmp/config/geronimo/ migration-ejb-bmp/config/jboss/ migration-ejb-bmp/src/ migration-ejb-bmp/src/META-INF/ migration-ejb-bmp/s...

Added: geronimo/samples/branches/1.1/migration-security/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/LICENSE.txt?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/LICENSE.txt (added)
+++ geronimo/samples/branches/1.1/migration-security/LICENSE.txt Mon Apr  7 23:40:31 2008
@@ -0,0 +1,350 @@
+
+                                 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] The Apache Software Foundation
+
+   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.
+
+=========================================================================
+J2G, Commons Logging, commons-el, jasper-runtime, jasper-compiler, 
+jasper-compiler-jdt, geronimo-jsp_spec, and geronimo-servlet-spec use the 
+above Apache License v2.0.
+=========================================================================
+   
+=========================================================================
+==  Dom4j License                                                      ==
+=========================================================================
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+   statements and notices.  Redistributions must also contain a
+   copy of this document.
+ 
+2. Redistributions in binary form must reproduce the
+   above copyright notice, this list of conditions and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
+ 
+3. The name "DOM4J" must not be used to endorse or promote
+   products derived from this Software without prior written
+   permission of MetaStuff, Ltd.  For written permission,
+   please contact dom4j-info@metastuff.com.
+ 
+4. Products derived from this Software may not be called "DOM4J"
+   nor may "DOM4J" appear in their names without prior written
+   permission of MetaStuff, Ltd. DOM4J is a registered
+   trademark of MetaStuff, Ltd.
+ 
+5. Due credit should be given to the DOM4J Project - 
+   http://www.dom4j.org
+ 
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================
+==  Jaxen License                                                      ==
+=========================================================================
+
+ Copyright 2003-2006 The Werken Company. All Rights Reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+  * Neither the name of the Jaxen Project nor the names of its
+    contributors may be used to endorse or promote products derived 
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+=========================================================================
+==  PullParser License                                                 ==
+=========================================================================
+
+Copyright 2002 The Trustees of Indiana University.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1) All redistributions of source code must retain the above
+   copyright notice, the list of authors in the original source
+   code, this list of conditions and the disclaimer listed in this
+   license;
+
+2) All redistributions in binary form must reproduce the above
+   copyright notice, this list of conditions and the disclaimer
+   listed in this license in the documentation and/or other
+   materials provided with the distribution;
+
+3) Any documentation included with all redistributions must include
+   the following acknowledgement:
+
+     "This product includes software developed by the Indiana 
+     University Extreme! Lab.  For further information please visit 
+     http://www.extreme.indiana.edu/"
+
+   Alternatively, this acknowledgment may appear in the software
+   itself, and wherever such third-party acknowledgments normally
+   appear.
+
+4) The name "Indiana Univeristy" and "Indiana Univeristy
+   Extreme! Lab" shall not be used to endorse or promote
+   products derived from this software without prior written
+   permission from Indiana University.  For written permission,
+   please contact http://www.extreme.indiana.edu/.
+
+5) Products derived from this software may not use "Indiana
+   Univeristy" name nor may "Indiana Univeristy" appear in their name,
+  without prior written permission of the Indiana University.
+ 
+Indiana University provides no reassurances that the source code
+provided does not infringe the patent or any other intellectual
+property rights of any other entity.  Indiana University disclaims any
+liability to any recipient for claims brought by any other entity
+based on infringement of intellectual property rights or otherwise.
+
+LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH
+NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA
+UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT
+SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR
+OTHER PROPRIETARY RIGHTS.  INDIANA UNIVERSITY MAKES NO WARRANTIES THAT
+SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP
+DOORS", "WORMS", OR OTHER HARMFUL CODE.  LICENSEE ASSUMES THE ENTIRE
+RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS,
+AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING
+SOFTWARE.
+
+
+
+
+

Propchange: geronimo/samples/branches/1.1/migration-security/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/NOTICE.txt?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/NOTICE.txt (added)
+++ geronimo/samples/branches/1.1/migration-security/NOTICE.txt Mon Apr  7 23:40:31 2008
@@ -0,0 +1,46 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+==  Version 2.0, in this case for the Apache Geronimo distribution.    ==
+=========================================================================
+
+Apache Geronimo
+Copyright 2003-2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of the J2G Conversion Tool were orginally developed by International
+Business Machines Corporation and are licensed to the Apache Software
+Foundation under the "Software Grant and Corporate Contribution License
+Agreement", informally known as the "IBM Console CLA".
+
+=========================================================================
+==  Commons-logging  Notice                                            ==
+=========================================================================
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
+=========================================================================
+==  Dom4j Notice                                                       ==
+=========================================================================
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+=========================================================================
+==  Jaxen Notice                                                       ==
+=========================================================================
+
+Copyright 2003-2006 The Werken Company. All Rights Reserved.
+
+=========================================================================
+==  PullParser Notice                                                  ==
+=========================================================================
+
+Copyright 2002 The Trustees of Indiana University.
+All rights reserved.
+
+This product includes software developed by the Indiana
+University Extreme! Lab.  For further information please visit
+http://www.extreme.indiana.edu/
+

Propchange: geronimo/samples/branches/1.1/migration-security/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/build.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/build.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/build.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/build.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,294 @@
+<?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.
+-->
+<!-- ====================================================================== 
+         JBoss to Geronimo Migration Samples
+  ====================================================================== -->
+<project name="DocumentManager" default="all">
+    <property name="src.dir" value="src" />
+    <property name="dest.dir" value="releases" />
+    <property name="web.dir" value="web" />
+    <property name="config.dir" value="config" />
+    <property file="${config.dir}/build.properties"/>
+
+    <!-- =================================================================== -->
+    <!-- Define the class path                                               -->
+    <!-- =================================================================== -->
+    <path id="class.path">
+        <fileset dir="${xdoclet.home}/lib">
+            <include name="*.jar" />
+        </fileset>
+        <fileset dir="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/">
+            <include name="geronimo-j2ee_1.4_spec-1.1.jar" />
+        </fileset>
+    </path>
+    
+    <!-- =================================================================== -->
+    <!-- target: all                                                         -->
+    <!-- =================================================================== -->
+    <target name="all" depends="geronimo,jboss"/>
+    
+    <!-- =================================================================== -->
+    <!-- target: geronimo                                                    -->
+    <!-- =================================================================== -->
+    <target name="geronimo" depends="geronimo-jar,geronimo-war">
+        <jar destfile="${dest.dir}/geronimo/DocumentManager.ear">
+            <zipfileset dir="${dest.dir}/geronimo/ear">
+            </zipfileset>
+        </jar>
+                 <copy todir="${geronimo.home}/var/security">
+                        <fileset file="${config.dir}/j2g_groups.properties" />
+                        <fileset file="${config.dir}/j2g_users.properties" />
+                </copy>
+
+        <delete dir="${dest.dir}/geronimo/ear"/>
+    </target>
+    
+    
+    <!-- =================================================================== -->
+    <!-- target: jboss                                                       -->
+    <!-- =================================================================== -->
+    <target name="jboss" depends="jboss-jar,jboss-war,jboss-sar">
+        <jar destfile="${dest.dir}/jboss/DocumentManager.ear">
+            <zipfileset dir="${dest.dir}/jboss/ear">
+            </zipfileset>
+        </jar>
+        <delete dir="${dest.dir}/jboss/ear"/>
+    </target>
+    
+    
+    <!-- =================================================================== -->
+    <!-- target: geronimo-jar                                                -->
+    <!-- =================================================================== -->
+    <target name="geronimo-jar" depends="geronimo-compile-ejb">
+        <jar destfile="${dest.dir}/geronimo/ear/DocumentManagerEJB.jar">
+            <zipfileset dir="${dest.dir}/geronimo/ear/ejb">
+            </zipfileset>
+        </jar>
+        <delete dir="${dest.dir}/geronimo/ear/ejb"/>
+    </target>
+    
+    <!-- =================================================================== -->
+    <!-- target: jboss-sar                                                   -->
+    <!-- =================================================================== -->
+    <target name="jboss-sar" depends="package">
+        <jar destfile="${dest.dir}/jboss/ear/DocumentManagerSAR.sar">
+            <zipfileset dir="${dest.dir}/jboss/ear/sar">
+            </zipfileset>
+        </jar>
+        <delete dir="${dest.dir}/jboss/ear/sar"/>
+    </target>
+    
+    <!-- =================================================================== -->
+    <!-- target: jboss-jar                                                   -->
+    <!-- =================================================================== -->
+    <target name="jboss-jar" depends="jboss-compile-ejb">
+        <jar destfile="${dest.dir}/jboss/ear/DocumentManagerEJB.jar">
+            <zipfileset dir="${dest.dir}/jboss/ear/ejb">
+            </zipfileset>
+        </jar>
+        <delete dir="${dest.dir}/jboss/ear/ejb"/>
+    </target>
+    
+    <!-- ================================= 
+                  target: geronimo-compile-ejb
+              ================================= -->
+    <target name="geronimo-compile-ejb" depends="package">
+        <javac srcdir="${src.dir}" destdir="${dest.dir}/geronimo/ear/ejb">
+            <classpath path="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/geronimo-j2ee_1.4_spec-1.1.jar" />
+        </javac>
+        
+        <delete>
+            <fileset dir="${dest.dir}/geronimo/ear/ejb">
+                <include name="org/apache/geronimo/samples/document/web/*.class" />
+            </fileset>
+        </delete>
+    </target>
+    
+    <!-- ================================= 
+                  target: jboss-compile-ejb
+          ================================= -->
+    <target name="jboss-compile-ejb" depends="package" >
+        <javac srcdir="${src.dir}" destdir="${dest.dir}/jboss/ear/ejb">
+            <classpath path="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/geronimo-j2ee_1.4_spec-1.1.jar" />
+        </javac>
+        <delete>
+            <fileset dir="${dest.dir}/jboss/ear/ejb">
+                <include name="org/apache/geronimo/samples/document/web/*.class" />
+            </fileset>
+        </delete>
+    </target>
+
+    <!-- ================================= 
+              target: geronimo-compile-web
+          ================================= -->
+    <target name="geronimo-compile-web" depends="package">
+        <javac srcdir="${src.dir}" destdir="${dest.dir}/geronimo/ear/war/WEB-INF/classes">
+            <classpath path="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/geronimo-j2ee_1.4_spec-1.1.jar" />
+        </javac>
+        <delete>
+            <fileset dir="${dest.dir}/geronimo/ear/war/WEB-INF/classes">
+                <include name="org/apache/geronimo/samples/document/ejb/*.class" />
+            </fileset>
+        </delete>
+    </target>
+    
+    <!-- ================================= 
+                  target: jboss-compile-web
+              ================================= -->
+    <target name="jboss-compile-web" depends="package">
+        <javac srcdir="${src.dir}" destdir="${dest.dir}/jboss/ear/war/WEB-INF/classes">
+            <classpath path="${geronimo.home}/repository/org/apache/geronimo/specs/geronimo-j2ee_1.4_spec/1.1/geronimo-j2ee_1.4_spec-1.1.jar" />
+        </javac>
+        
+        <delete>
+            <fileset dir="${dest.dir}/jboss/ear/war/WEB-INF/classes">
+                <include name="org/apache/geronimo/samples/document/ejb/*.class" />
+            </fileset>
+        </delete>
+    </target>
+
+
+    <!-- =================================================================== -->
+    <!-- target: geronimo-war                                                -->
+    <!-- =================================================================== -->
+    <target name="geronimo-war" depends="geronimo-compile-web">
+        
+        <delete file="${dest.dir}/geronimo/ear/war/WEB-INF/jboss-web.xml"/>
+        
+        <jar destfile="${dest.dir}/geronimo/ear/DocumentManagerWeb.war">
+            <zipfileset dir="${dest.dir}/geronimo/ear/war">
+            </zipfileset>
+        </jar>
+        <delete dir="${dest.dir}/geronimo/ear/war"/>
+    </target>
+    
+    <!-- =================================================================== -->
+    <!-- target: jboss-war                                                   -->
+    <!-- =================================================================== -->
+    <target name="jboss-war" depends="jboss-compile-web">
+        
+        <delete file="${dest.dir}/jboss/ear/war/WEB-INF/geronimo-web.xml"/>
+        
+        <jar destfile="${dest.dir}/jboss/ear/DocumentManagerWeb.war">
+            <zipfileset dir="${dest.dir}/jboss/ear/war">
+            </zipfileset>
+        </jar>
+        <delete dir="${dest.dir}/jboss/ear/war"/>
+    </target>
+
+    <!-- ================================= 
+                  package: build directory structure              
+      ================================= -->
+    <target name="package" depends="ejbdoclet">
+        <mkdir dir="${dest.dir}/geronimo" />
+        <mkdir dir="${dest.dir}/jboss" />
+
+        <mkdir dir="${dest.dir}/geronimo/ear" />
+        <mkdir dir="${dest.dir}/jboss/ear" />
+        
+        <mkdir dir="${dest.dir}/geronimo/ear/META-INF" />
+        <mkdir dir="${dest.dir}/jboss/ear/META-INF" />
+
+        <copy todir="${dest.dir}/geronimo/ear/META-INF">
+            <fileset file="${config.dir}/geronimo/application.xml" />
+            <fileset file="${config.dir}/geronimo/geronimo-application.xml" />
+        </copy>
+        
+        <copy todir="${dest.dir}/jboss/ear/META-INF">
+            <fileset file="${config.dir}/jboss/application.xml" />
+        </copy>
+        
+        <mkdir dir="${dest.dir}/jboss/ear/sar" />
+        <mkdir dir="${dest.dir}/jboss/ear/sar/META-INF" />
+        
+        <copy todir="${dest.dir}/jboss/ear/sar">
+            <fileset file="${config.dir}/j2g_groups.properties" />
+            <fileset file="${config.dir}/j2g_users.properties" />
+        </copy>
+        
+        <copy todir="${dest.dir}/jboss/ear/sar/META-INF">
+            <fileset file="${config.dir}/jboss/jboss-service.xml" />
+            <fileset file="${config.dir}/jboss/login-config.xml" />
+        </copy>
+        
+        <mkdir dir="${dest.dir}/geronimo/ear/war" />
+        <mkdir dir="${dest.dir}/jboss/ear/war" />
+        
+        <mkdir dir="${dest.dir}/geronimo/ear/ejb" />
+        <mkdir dir="${dest.dir}/geronimo/ear/ejb/META-INF" />
+        
+        <mkdir dir="${dest.dir}/jboss/ear/ejb" />
+        <mkdir dir="${dest.dir}/jboss/ear/ejb/META-INF" />
+        
+        <copy todir="${dest.dir}/geronimo/ear/ejb/META-INF">
+            <fileset file="${config.dir}/ejb-jar.xml" />
+            <fileset file="${config.dir}/geronimo/openejb-jar.xml" />
+        </copy>
+        
+        <copy todir="${dest.dir}/jboss/ear/ejb/META-INF">
+            <fileset file="${config.dir}/ejb-jar.xml" />
+            <fileset file="${config.dir}/jboss/jboss.xml" />
+        </copy>
+        
+        <copy todir="${dest.dir}/geronimo/ear/war">
+            <fileset dir="${web.dir}" />
+        </copy>
+        
+        <mkdir dir="${dest.dir}/geronimo/ear/war/WEB-INF/classes" />
+        <mkdir dir="${dest.dir}/jboss/ear/war/WEB-INF/classes" />
+        
+        <copy todir="${dest.dir}/jboss/ear/war">
+            <fileset dir="${web.dir}" />
+        </copy>     
+    </target>
+
+    <!-- =================================================================== -->
+    <!-- Invoke XDoclet's ejbdoclet                                          -->
+    <!-- =================================================================== -->
+    <target name="ejbdoclet" depends="init">
+
+        <ejbdoclet destdir="${src.dir}" mergedir="parent-fake-to-debug" excludedtags="@version,@author,@todo" addedtags="@xdoclet-generated at ${TODAY},@copyright The XDoclet Team,@author XDoclet,@version ${version}" ejbspec="2.1" force="${samples.xdoclet.force}" verbose="false">
+
+            <fileset dir="${src.dir}">
+                <include name="org/apache/geronimo/samples/document/ejb/*Bean.java" />
+            </fileset>
+            
+            <remoteinterface />
+            <homeinterface />
+            
+            <localinterface />
+            <localhomeinterface />
+
+            <entitycmp />
+            <entitybmp />
+
+            <deploymentdescriptor destdir="${config.dir}" validatexml="true" mergedir="fake-to-debug" description="">
+            </deploymentdescriptor>
+
+        </ejbdoclet>
+    </target>
+
+    <!-- ================================= 
+                      init: initialize EJBDoclet and WebDoclet Tasks              
+          ================================= -->
+    <target name="init">
+        <taskdef name="ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" classpathref="class.path" />
+    </target>
+
+</project>
+

Propchange: geronimo/samples/branches/1.1/migration-security/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/build.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/build.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/build.properties?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/build.properties (added)
+++ geronimo/samples/branches/1.1/migration-security/config/build.properties Mon Apr  7 23:40:31 2008
@@ -0,0 +1,20 @@
+# 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.
+
+## Set the Geronimo 1.1 home here
+geronimo.home=/home/lasantha/installation/geronimo/1.1.1/tomcat/geronimo-1.1.1
+
+## Set the XDoclet 1.2.3 home here 
+xdoclet.home=/home/lasantha/installation/xdoclet-1.2.3

Propchange: geronimo/samples/branches/1.1/migration-security/config/build.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/build.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/build.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,133 @@
+<?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.
+-->
+
+<ejb-jar  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd" version="2.1">
+
+   <display-name>Generated by XDoclet</display-name>
+
+   <enterprise-beans>
+
+      <!-- Session Beans -->
+      <session >
+         <description><![CDATA[DocumentManager]]></description>
+         <display-name>DocumentManager</display-name>
+
+         <ejb-name>DocumentManager</ejb-name>
+
+         <home>org.apache.geronimo.samples.document.ejb.DocumentManagerHome</home>
+         <remote>org.apache.geronimo.samples.document.ejb.DocumentManager</remote>
+         <ejb-class>org.apache.geronimo.samples.document.ejb.DocumentManagerBean</ejb-class>
+         <session-type>Stateless</session-type>
+         <transaction-type>Container</transaction-type>
+
+      </session>
+
+     <!--
+       To add session beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called session-beans.xml that contains
+       the <session></session> markup for those beans.
+     -->
+
+      <!-- Entity Beans -->
+     <!--
+       To add entity beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called entity-beans.xml that contains
+       the <entity></entity> markup for those beans.
+     -->
+
+      <!-- Message Driven Beans -->
+     <!--
+       To add message driven beans that you have deployment descriptor info for, add
+       a file to your XDoclet merge directory called message-driven-beans.xml that contains
+       the <message-driven></message-driven> markup for those beans.
+     -->
+
+   </enterprise-beans>
+
+   <!-- Relationships -->
+
+   <!-- Assembly Descriptor -->
+     <!--
+       To specify your own assembly descriptor info here, add a file to your
+       XDoclet merge directory called assembly-descriptor.xml that contains
+       the <assembly-descriptor></assembly-descriptor> markup.
+     -->
+
+   <assembly-descriptor >
+     <!--
+       To specify additional security-role elements, add a file in the merge
+       directory called ejb-security-roles.xml that contains them.
+     -->
+      <security-role>
+         <description><![CDATA[description not supported yet by ejbdoclet]]></description>
+         <role-name>uploader</role-name>
+      </security-role>
+
+   <!-- method permissions -->
+     <!--
+       To specify additional method-permission elements, add a file in the merge
+       directory called ejb-method-permissions.ent that contains them.
+     -->
+
+   <method-permission >
+      <description><![CDATA[description not supported yet by ejbdoclet]]></description>
+         <role-name>uploader</role-name>
+      <method >
+         <description><![CDATA[]]></description>
+         <ejb-name>DocumentManager</ejb-name>
+         <method-intf>Remote</method-intf>
+         <method-name>upload</method-name>
+         <method-params>
+         </method-params>
+      </method>
+   </method-permission>
+   <method-permission >
+      <description><![CDATA[description not supported yet by ejbdoclet]]></description>
+      <unchecked/>
+      <method >
+         <description><![CDATA[]]></description>
+         <ejb-name>DocumentManager</ejb-name>
+         <method-intf>Home</method-intf>
+         <method-name>create</method-name>
+         <method-params>
+         </method-params>
+      </method>
+   </method-permission>
+
+   <!-- transactions -->
+     <!--
+       To specify additional container-transaction elements, add a file in the merge
+       directory called ejb-container-transactions.ent that contains them.
+     -->
+
+   <!-- finder transactions -->
+
+   <!-- message destinations -->
+     <!--
+       To specify additional message-destination elements, add a file in the merge
+       directory called ejb-message-destinations.ent that contains them.
+     -->
+
+   <!-- exclude list -->
+     <!--
+       To specify an exclude-list element, add a file in the merge directory
+       called ejb-exclude-list.xml that contains it.
+     -->
+   </assembly-descriptor>
+
+</ejb-jar>

Propchange: geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/ejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,34 @@
+<?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.
+-->
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="1.4"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+
+  <module>
+    <ejb>DocumentManagerEJB.jar</ejb>
+  </module>
+
+  <module>
+    <web>
+      <web-uri>DocumentManagerWeb.war</web-uri>
+      <context-root>/document</context-root>
+    </web>
+  </module>
+
+</application>

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,72 @@
+<?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.
+-->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+            <dep:artifactId>DocumentManager</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dependency>
+                <groupId>geronimo</groupId>
+                <artifactId>j2ee-security</artifactId>
+                <type>car</type>
+            </dependency>
+        </dep:dependencies>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
+    <security xmlns="http://geronimo.apache.org/xml/ns/security">
+        <default-principal realm-name="j2g">
+            <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+        </default-principal>
+        <role-mappings>
+            <role role-name="authenticated">
+                <realm realm-name="j2g">
+                    <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="authenticated"/>
+                </realm>
+            </role>
+            <role role-name="uploader">
+                <realm realm-name="j2g">
+                    <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="uploader"/>
+               </realm>
+            </role>
+        </role-mappings>
+    </security>
+    <gbean name="j2g" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
+        <attribute name="realmName">j2g</attribute>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
+        <reference name="LoginService">
+            <name>JaasLoginService</name>
+        </reference>
+        <xml-reference name="LoginModuleConfiguration">
+            <log:login-config xmlns:log="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
+                <log:login-module control-flag="REQUIRED" server-side="true" wrap-principals="false">
+                    <log:login-domain-name>j2g</log:login-domain-name>
+                    <log:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</log:login-module-class>
+                    <log:option name="usersURI">var/security/j2g_users.properties</log:option>
+                    <log:option name="groupsURI">var/security/j2g_groups.properties</log:option>
+                </log:login-module>
+            </log:login-config>
+        </xml-reference>
+    </gbean>
+ </application>

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/geronimo-application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,35 @@
+<?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.
+-->
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+            <dep:artifactId>DocumentManagerEJB</dep:artifactId>
+            <dep:version>1.0</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
+    <enterprise-beans>
+        <session>
+            <ejb-name>DocumentManager</ejb-name>
+        </session>
+    </enterprise-beans>
+</openejb-jar>

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/geronimo/openejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties (added)
+++ geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties Mon Apr  7 23:40:31 2008
@@ -0,0 +1,17 @@
+# 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.
+
+user=authenticated
+editor=authenticated,uploader

Propchange: geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/j2g_groups.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties (added)
+++ geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties Mon Apr  7 23:40:31 2008
@@ -0,0 +1,17 @@
+# 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.
+
+user=1
+editor=2

Propchange: geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/j2g_users.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,37 @@
+<?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.
+-->
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="1.4"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
+
+  <module>
+    <ejb>DocumentManagerSAR.sar</ejb>
+  </module>
+
+  <module>
+    <ejb>DocumentManagerEJB.jar</ejb>
+  </module>
+
+  <module>
+    <web>
+      <web-uri>DocumentManagerWeb.war</web-uri>
+      <context-root>/document</context-root>
+    </web>
+  </module>
+</application>

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<server>
+   <mbean code="org.jboss.security.auth.login.DynamicLoginConfig"
+      name="jboss.web:service=DynaSecurityDomain">
+      <attribute name="AuthConfig">META-INF/login-config.xml</attribute>
+      <!-- The service which supports dynamic processing of login-config.xml
+         configurations.
+      -->
+      <depends optional-attribute-name="LoginConfigService">
+         jboss.security:service=XMLLoginConfig
+      </depends>
+      <!-- Optionally specify the security mgr service to use when
+         this service is stopped to flush the auth caches of the domains
+         registered by this service.
+      -->
+      <depends optional-attribute-name="SecurityManagerService">
+         jboss.security:service=JaasSecurityManager
+      </depends>
+   </mbean>
+</server>

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss-service.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,37 @@
+<?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.
+-->
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
+
+<jboss>
+   <security-domain>java:/jaas/j2g</security-domain>    
+   <enterprise-beans>
+
+      <session>
+         <ejb-name>DocumentManager</ejb-name>
+         <jndi-name>ejb/DocumentManager</jndi-name>
+
+        <method-attributes>
+        </method-attributes>
+      </session>
+      
+   </enterprise-beans>
+
+   <resource-managers>
+   </resource-managers>
+
+</jboss>

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/jboss.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,28 @@
+<?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.
+-->
+<policy>
+  <application-policy name="j2g">
+      <authentication>
+          <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" flag="required">
+             <module-option name="usersProperties">j2g_users.properties</module-option>
+             <module-option name="rolesProperties">j2g_groups.properties</module-option>
+             <module-option name="unauthenticatedIdentity">nobody</module-option>
+          </login-module>
+     </authentication>
+  </application-policy>
+</policy>

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/config/jboss/login-config.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java (added)
+++ geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,20 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.apache.geronimo.samples.document.ejb;
+
+/**
+ * Remote interface for DocumentManager.
+ * @xdoclet-generated at ${TODAY}
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface DocumentManager
+   extends javax.ejb.EJBObject
+{
+
+   public java.lang.String upload(  )
+      throws java.rmi.RemoteException;
+
+}

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManager.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java (added)
+++ geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,73 @@
+/*
+* 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 org.apache.geronimo.samples.document.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionContext;
+
+
+/**
+ * @ejb.bean name="DocumentManager" 
+ *           description="DocumentManager"
+ *           display-name="DocumentManager"
+ *           jndi-name="ejb/DocumentManager"
+ *           type="Stateless" 
+ *           transaction-type="Container"
+ *           view-type="remote"
+ *           
+ * @ejb.interface generate="remote" remote-class="org.apache.geronimo.samples.document.ejb.DocumentManager"
+ * @ejb.home generate="remote" remote-class=""-class="org.apache.geronimo.samples.document.ejb.DocumentManagerHome"
+ * 
+ */
+public class DocumentManagerBean implements javax.ejb.SessionBean {
+    
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 5910882211249828856L;
+
+    /**
+     * @ejb.interface-method view-type="remote"
+     * @ejb.permission role-name = "uploader"
+     * @return result message
+     */
+    public String upload() {
+        return "File successfully uploaded";
+    }
+    
+    /**
+     * @ejb.permission unchecked="true"
+     * @ejb.create-method view-type="remote"
+     * @generated
+     */
+    public void ejbCreate() {
+    }
+
+    public void ejbActivate() throws EJBException, RemoteException {
+    }
+
+    public void ejbPassivate() throws EJBException, RemoteException {
+    }
+
+    public void ejbRemove() throws EJBException, RemoteException {
+    }
+
+    public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException {
+    }
+}

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java (added)
+++ geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,22 @@
+/*
+ * Generated by XDoclet - Do not edit!
+ */
+package org.apache.geronimo.samples.document.ejb;
+
+/**
+ * Home interface for DocumentManager.
+ * @xdoclet-generated at ${TODAY}
+ * @copyright The XDoclet Team
+ * @author XDoclet
+ * @version ${version}
+ */
+public interface DocumentManagerHome
+   extends javax.ejb.EJBHome
+{
+   public static final String COMP_NAME="java:comp/env/ejb/DocumentManager";
+   public static final String JNDI_NAME="ejb/DocumentManager";
+
+   public org.apache.geronimo.samples.document.ejb.DocumentManager create()
+      throws javax.ejb.CreateException,java.rmi.RemoteException;
+
+}

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/ejb/DocumentManagerHome.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java (added)
+++ geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,46 @@
+/*
+* 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 org.apache.geronimo.samples.document.web;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class LogoutServlet extends HttpServlet{
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -503932787429016885L;
+    
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        logOut(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+    
+    private void logOut(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        req.getSession().invalidate();
+        res.sendRedirect(req.getContextPath() + "/");
+        return;
+    }
+}

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/LogoutServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java (added)
+++ geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java Mon Apr  7 23:40:31 2008
@@ -0,0 +1,71 @@
+/*
+* 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 org.apache.geronimo.samples.document.web;
+
+import java.io.IOException;
+
+import javax.ejb.CreateException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.samples.document.ejb.DocumentManager;
+import org.apache.geronimo.samples.document.ejb.DocumentManagerHome;
+
+public class UploadServlet extends HttpServlet{
+
+    private static final long serialVersionUID = -2773446199481416101L;
+    private DocumentManagerHome docManagerHome;
+    
+    
+    public void destroy() {
+        docManagerHome = null;
+        super.destroy();
+    }
+
+    public void init() throws ServletException {
+        try {
+            Context context = new InitialContext();
+            docManagerHome = (DocumentManagerHome)context.lookup(DocumentManagerHome.JNDI_NAME);
+        } catch (Throwable e) {
+            throw new ServletException(e);
+        }
+    }
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        DocumentManager docManager = upload();
+        req.setAttribute("result", docManager.upload());
+        req.getRequestDispatcher("jsp/main.jsp").forward(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+    
+    
+    private DocumentManager upload() throws ServletException, IOException {
+        try {
+            return docManagerHome.create();
+        } catch (CreateException e) {
+            throw new ServletException(e);
+        } 
+    }
+
+}

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/src/org/apache/geronimo/samples/document/web/UploadServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,33 @@
+<?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="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <dep:moduleId>
+      <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+      <dep:artifactId>DocumentManagerWeb</dep:artifactId>
+      <dep:version>1.0</dep:version>
+      <dep:type>car</dep:type>
+    </dep:moduleId>
+    <dep:dependencies/>    
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <context-root>/document</context-root> 
+  <security-realm-name>j2g</security-realm-name>
+</web-app>
+

Propchange: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml?rev=645776&view=auto
==============================================================================
--- geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml (added)
+++ geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml Mon Apr  7 23:40:31 2008
@@ -0,0 +1,21 @@
+<?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.
+-->
+<jboss-web>
+    <context-root>/document</context-root>
+    <security-domain>java:/jaas/j2g</security-domain>
+</jboss-web>
\ No newline at end of file

Propchange: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/branches/1.1/migration-security/web/WEB-INF/jboss-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml