svnno****@sourc*****
svnno****@sourc*****
2008年 11月 20日 (木) 09:00:59 JST
Revision: 1377 http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1377 Author: shinsuke Date: 2008-11-20 09:00:58 +0900 (Thu, 20 Nov 2008) Log Message: ----------- clean up for m2. Modified Paths: -------------- chat/trunk/pom.xml chat/trunk/src/main/resources/app.dicon chat/trunk/src/main/resources/jdbc.dicon chat/trunk/src/main/webapp/WEB-INF/web.xml Added Paths: ----------- chat/trunk/.classpath chat/trunk/.project chat/trunk/.settings/ chat/trunk/.settings/org.eclipse.jdt.core.prefs Removed Paths: ------------- chat/trunk/licenses/LICENSE.h2.html chat/trunk/licenses/LICENSE.hsqldb.txt chat/trunk/licenses/LICENSE.was_uow.html chat/trunk/src/main/resources/data/ chat/trunk/src/main/webapp/WEB-INF/tld/ chat/trunk/src/main/webapp/WEB-INF/view/common/footer.jsp chat/trunk/src/main/webapp/WEB-INF/view/common/header.jsp chat/trunk/src/main/webapp/WEB-INF/view/common/layout.jsp chat/trunk/src/main/webapp/WEB-INF/view/common/menu.jsp -------------- next part -------------- Added: chat/trunk/.classpath =================================================================== --- chat/trunk/.classpath (rev 0) +++ chat/trunk/.classpath 2008-11-20 00:00:58 UTC (rev 1377) @@ -0,0 +1,43 @@ +<classpath> + <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/java"/> + <classpathentry kind="src" output="src/main/webapp/WEB-INF/classes" path="src/main/resources"/> + <classpathentry kind="src" path="src/main/webapp/WEB-INF/view"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + + <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar"/> + <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/> + <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2/commons-collections-3.2.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/taglibs/standard/1.1.2/standard-1.1.2.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3/commons-io-1.3.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.6/commons-digester-1.6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar" sourcepath="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.29/s2-extension-2.4.29.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.29/s2-framework-2.4.29.jar"/> + <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/> + <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070908/ognl-2.6.9-patch-20070908.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.29/s2-tiger-2.4.29.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/sastruts/sa-struts-portlet/1.0.0-rc3/sa-struts-portlet-1.0.0-rc3.jar" sourcepath="M2_REPO/org/seasar/sastruts/sa-struts-portlet/1.0.0-rc3/sa-struts-portlet-1.0.0-rc3-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/> + <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1.jar" sourcepath="M2_REPO/xalan/xalan/2.5.1/xalan-2.5.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seasar/sastruts/sa-struts/1.0.4-sp1/sa-struts-1.0.4-sp1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-annotation_1.0_spec/1.0/geronimo-annotation_1.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0/geronimo-ejb_3.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-interceptor_3.0_spec/1.0/geronimo-interceptor_3.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.0/geronimo-jsp_2.0_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jpa_3.0_spec/1.0/geronimo-jpa_3.0_spec-1.0.jar"/> +</classpath> Property changes on: chat/trunk/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: chat/trunk/.project =================================================================== --- chat/trunk/.project (rev 0) +++ chat/trunk/.project 2008-11-20 00:00:58 UTC (rev 1377) @@ -0,0 +1,14 @@ +<projectDescription> + <name>chat</name> + <comment/> + <projects/> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments/> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Property changes on: chat/trunk/.project ___________________________________________________________________ Name: svn:eol-style + native Added: chat/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- chat/trunk/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ chat/trunk/.settings/org.eclipse.jdt.core.prefs 2008-11-20 00:00:58 UTC (rev 1377) @@ -0,0 +1,5 @@ +#Thu Nov 20 08:56:15 JST 2008 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 Deleted: chat/trunk/licenses/LICENSE.h2.html =================================================================== --- chat/trunk/licenses/LICENSE.h2.html 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/licenses/LICENSE.h2.html 2008-11-20 00:00:58 UTC (rev 1377) @@ -1,396 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<!-- -Copyright 2004-2006 H2 Group. Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). -Initial Developer: H2 Group ---> -<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8"><title> -License -</title><link rel="stylesheet" type="text/css" href="stylesheet.css"> -<script type="text/javascript" src="navigation.js"></script> -</head><body onload="frameMe();"> -<table class="content"><tr class="content"><td class="content"><div class="contentDiv"> - -<h1>License</h1> - -<h2>Summary and License FAQ</h2> -This license is a modified version of the MPL 1.1 available at <a href="http://www.mozilla.org/MPL">www.mozilla.org/MPL</a>, -the changes are <u>underlined</u>. -There is a License FAQ section at the Mozilla web site, most of that is applicable to the H2 License as well. -<ul> -<li>You can use H2 for free. You can integrate it into your application (including commercial applications), and you can distribute it. -<li>Files containing only your code are not covered by this license (it is 'commercial friendly'). -<li>Modifications to the H2 source code must be published. -<li>You don't need to provide the source code of H2 if you did not modify anything. -</ul> -However, nobody is allowed to rename H2, modify it a little, and sell it as a database engine without telling the customers it is in fact H2. -This happened to HSQLDB, when a company called 'bungisoft' copied HSQLDB, renamed it to 'RedBase', and tried to sell it, -hiding the fact that it was, in fact, just HSQLDB. At this time, it seems 'bungisoft' does not exist any more, but you can use the -Wayback Machine of http://www.archive.org and look for old web pages of http://www.bungisoft.com. -<p> -About porting the source code to another language (for example C# or C++): Converted source code (even if done manually) stays under the same -copyright and license as the original code. The copyright of the ported source code does not (automatically) go to the person ported the code. - -<h2>H2 License, Version 1.0</h2> - - <h3 id="section-1">1. Definitions</h3> - <p id="section-1.0.1"><b>1.0.1. "Commercial Use"</b> - means distribution or otherwise making the Covered Code available to a third party. - </p> - <p id="section-1.1"><b>1.1. "Contributor"</b> - means each entity that creates or contributes to the creation of Modifications. - </p> - <p id="section-1.2"><b>1.2. "Contributor Version"</b> - means the combination of the Original Code, prior Modifications used by a Contributor, - and the Modifications made by that particular Contributor. - </p> - <p id="section-1.3"><b>1.3. "Covered Code"</b> - means the Original Code or Modifications or the combination of the Original Code and - Modifications, in each case including portions thereof. - </p> - <p id="section-1.4"><b>1.4. "Electronic Distribution Mechanism"</b> - means a mechanism generally accepted in the software development community for the - electronic transfer of data. - </p> - <p id="section-1.5"><b>1.5. "Executable"</b> - means Covered Code in any form other than Source Code. - </p> - <p id="section-1.6"><b>1.6. "Initial Developer"</b> - means the individual or entity identified as the Initial Developer in the Source Code - notice required by <a href="#exhibit-a">Exhibit A</a>. - </p> - <p id="section-1.7"><b>1.7. "Larger Work"</b> - means a work which combines Covered Code or portions thereof with code not governed - by the terms of this License. - </p> - <p id="section-1.8"><b>1.8. "License"</b> - means this document. - </p> - <p id="section-1.8.1"><b>1.8.1. "Licensable"</b> - means having the right to grant, to the maximum extent possible, whether at the - time of the initial grant or subsequently acquired, any and all of the rights - conveyed herein. - </p> - <p id="section-1.9"><b>1.9. "Modifications"</b> - means any addition to or deletion from the substance or structure of either the - Original Code or any previous Modifications. When Covered Code is released as a - series of files, a Modification is: - </p> - <ol type="a"> - <li id="section-1.9-a">Any addition to or deletion from the contents of a file - containing Original Code or previous Modifications. - <li id="section-1.9-b">Any new file that contains any part of the Original Code or - previous Modifications. - </ol> - <p id="section-1.10"><b>1.10. "Original Code"</b> - means Source Code of computer software code which is described in the Source Code - notice required by <a href="#exhibit-a">Exhibit A</a> as Original Code, and which, - at the time of its release under this License is not already Covered Code governed - by this License. - </p> - <p id="section-1.10.1"><b>1.10.1. "Patent Claims"</b> - means any patent claim(s), now owned or hereafter acquired, including without - limitation, method, process, and apparatus claims, in any patent Licensable by - grantor. - </p> - <p id="section-1.11"><b>1.11. "Source Code"</b> - means the preferred form of the Covered Code for making modifications to it, - including all modules it contains, plus any associated interface definition files, - scripts used to control compilation and installation of an Executable, or source - code differential comparisons against either the Original Code or another well known, - available Covered Code of the Contributor's choice. The Source Code can be in a - compressed or archival form, provided the appropriate decompression or de-archiving - software is widely available for no charge. - </p> - <p id="section-1.12"><b>1.12. "You" (or "Your")</b> - means an individual or a legal entity exercising rights under, and complying with - all of the terms of, this License or a future version of this License issued under - <a href="#section-6.1">Section 6.1.</a> For legal entities, "You" includes any entity - which controls, is controlled by, or is under common control with You. For purposes of - this definition, "control" means (a) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or otherwise, or (b) - ownership of more than fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - </p> - - <h3 id="section-2">2. Source Code License</h3> - <h4 id="section-2.1">2.1. The Initial Developer Grant</h4> - <p>The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive - license, subject to third party intellectual property claims: - <ol type="a"> - <li id="section-2.1-a">under intellectual property rights (other than patent or - trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, - sublicense and distribute the Original Code (or portions thereof) with or without - Modifications, and/or as part of a Larger Work; and - <li id="section-2.1-b">under Patents Claims infringed by the making, using or selling - of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or - otherwise dispose of the Original Code (or portions thereof). - <li id="section-2.1-c">the licenses granted in this Section 2.1 - (<a href="#section-2.1-a">a</a>) and (<a href="#section-2.1-b">b</a>) are effective on - the date Initial Developer first distributes Original Code under the terms of this - License. - <li id="section-2.1-d">Notwithstanding Section 2.1 (<a href="#section-2.1-b">b</a>) - above, no patent license is granted: 1) for code that You delete from the Original Code; - 2) separate from the Original Code; or 3) for infringements caused by: i) the - modification of the Original Code or ii) the combination of the Original Code with other - software or devices. - </ol> - - <h4 id="section-2.2">2.2. Contributor Grant</h4> - <p>Subject to third party intellectual property claims, each Contributor hereby grants You - a world-wide, royalty-free, non-exclusive license - <ol type="a"> - <li id="section-2.2-a">under intellectual property rights (other than patent or trademark) - Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and - distribute the Modifications created by such Contributor (or portions thereof) either on - an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger - Work; and - <li id="section-2.2-b">under Patent Claims infringed by the making, using, or selling of - Modifications made by that Contributor either alone and/or in combination with its - Contributor Version (or portions of such combination), to make, use, sell, offer for - sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor - (or portions thereof); and 2) the combination of Modifications made by that Contributor - with its Contributor Version (or portions of such combination). - <li id="section-2.2-c">the licenses granted in Sections 2.2 - (<a href="#section-2.2-a">a</a>) and 2.2 (<a href="#section-2.2-b">b</a>) are effective - on the date Contributor first makes Commercial Use of the Covered Code. - <li id="section-2.2-d">Notwithstanding Section 2.2 (<a href="#section-2.2-b">b</a>) - above, no patent license is granted: 1) for any code that Contributor has deleted from - the Contributor Version; 2) separate from the Contributor Version; 3) for infringements - caused by: i) third party modifications of Contributor Version or ii) the combination of - Modifications made by that Contributor with other software (except as part of the - Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code - in the absence of Modifications made by that Contributor. - </ol> - - <h3 id="section-3">3. Distribution Obligations</h3> - <h4 id="section-3.1">3.1. Application of License</h4> - <p>The Modifications which You create or to which You contribute are governed by the terms - of this License, including without limitation Section <a href="#section-2.2">2.2</a>. The - Source Code version of Covered Code may be distributed only under the terms of this License - or a future version of this License released under Section <a href="#section-6.1">6.1</a>, - and You must include a copy of this License with every copy of the Source Code You - distribute. You may not offer or impose any terms on any Source Code version that alters or - restricts the applicable version of this License or the recipients' rights hereunder. - However, You may include an additional document offering the additional rights described in - Section <a href="#section-3.5">3.5</a>. - <h4 id="section-3.2">3.2. Availability of Source Code</h4> - <p>Any Modification which You create or to which You contribute must be made available in - Source Code form under the terms of this License either on the same media as an Executable - version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an - Executable version available; and if made available via Electronic Distribution Mechanism, - must remain available for at least twelve (12) months after the date it initially became - available, or at least six (6) months after a subsequent version of that particular - Modification has been made available to such recipients. You are responsible for ensuring - that the Source Code version remains available even if the Electronic Distribution - Mechanism is maintained by a third party. - <h4 id="section-3.3">3.3. Description of Modifications</h4> - - <p>You must cause all Covered Code to which You contribute to contain a file documenting the - changes You made to create that Covered Code and the date of any change. You must include a - prominent statement that the Modification is derived, directly or indirectly, from Original - Code provided by the Initial Developer and including the name of the Initial Developer in - (a) the Source Code, and (b) in any notice in an Executable version or related documentation - in which You describe the origin or ownership of the Covered Code. - <h4 id="section-3.4">3.4. Intellectual Property Matters</h4> - <ol type="a"> - <li id="section-3.4-a"><b>Third Party Claims:</b> - If Contributor has knowledge that a license under a third party's intellectual property - rights is required to exercise the rights granted by such Contributor under Sections - <a href="#section-2.1">2.1</a> or <a href="#section-2.2">2.2</a>, Contributor must include a - text file with the Source Code distribution titled "LEGAL" which describes the claim and the - party making the claim in sufficient detail that a recipient will know whom to contact. If - Contributor obtains such knowledge after the Modification is made available as described in - Section <a href="#section-3.2">3.2</a>, Contributor shall promptly modify the LEGAL file in - all copies Contributor makes available thereafter and shall take other steps (such as - notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who - received the Covered Code that new knowledge has been obtained. - <li id="section-3.4-b"><b>Contributor APIs:</b> - If Contributor's Modifications include an application programming interface and Contributor - has knowledge of patent licenses which are reasonably necessary to implement that - API, Contributor must also include this information in the legal file. - <li id="section-3.4-c"><b>Representations:</b> - Contributor represents that, except as disclosed pursuant to Section 3.4 - (<a href="#section-3.4-a">a</a>) above, Contributor believes that Contributor's Modifications - are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the - rights conveyed by this License. - </ol> - <h4 id="section-3.5">3.5. Required Notices</h4> - <p>You must duplicate the notice in <a href="#exhibit-a">Exhibit A</a> in each file of the - Source Code. If it is not possible to put such notice in a particular Source Code file due to - its structure, then You must include such notice in a location (such as a relevant directory) - where a user would be likely to look for such a notice. If You created one or more - Modification(s) You may add your name as a Contributor to the notice described in - <a href="#exhibit-a">Exhibit A</a>. You must also duplicate this License in any documentation - for the Source Code where You describe recipients' rights or ownership rights relating to - Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity - or liability obligations to one or more recipients of Covered Code. However, You may do so - only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You - must make it absolutely clear than any such warranty, support, indemnity or liability - obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer - and every Contributor for any liability incurred by the Initial Developer or such Contributor - as a result of warranty, support, indemnity or liability terms You offer. - <h4 id="section-3.6">3.6. Distribution of Executable Versions</h4> - <p>You may distribute Covered Code in Executable form only if the requirements of Sections - <a href="#section-3.1">3.1</a>, <a href="#section-3.2">3.2</a>, - <a href="#section-3.3">3.3</a>, <a href="#section-3.4">3.4</a> and - <a href="#section-3.5">3.5</a> have been met for that Covered Code, and if You include a - notice stating that the Source Code version of the Covered Code is available under the terms - of this License, including a description of how and where You have fulfilled the obligations - of Section <a href="#section-3.2">3.2</a>. The notice must be conspicuously included in any - notice in an Executable version, related documentation or collateral in which You describe - recipients' rights relating to the Covered Code. You may distribute the Executable version of - Covered Code or ownership rights under a license of Your choice, which may contain terms - different from this License, provided that You are in compliance with the terms of this - License and that the license for the Executable version does not attempt to limit or alter the - recipient's rights in the Source Code version from the rights set forth in this License. If - You distribute the Executable version under a different license You must make it absolutely - clear that any terms which differ from this License are offered by You alone, not by the - Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and - every Contributor for any liability incurred by the Initial Developer or such Contributor as - a result of any such terms You offer. - <h4 id="section-3.7">3.7. Larger Works</h4> - - <p>You may create a Larger Work by combining Covered Code with other code not governed by the - terms of this License and distribute the Larger Work as a single product. In such a case, - You must make sure the requirements of this License are fulfilled for the Covered Code. - <h3 id="section-4">4. Inability to Comply Due to Statute or Regulation.</h3> - <p>If it is impossible for You to comply with any of the terms of this License with respect to - some or all of the Covered Code due to statute, judicial order, or regulation then You must: - (a) comply with the terms of this License to the maximum extent possible; and (b) describe - the limitations and the code they affect. Such description must be included in the - <strong class="very-strong">legal</strong> file described in Section - <a href="#section-3.4">3.4</a> and must be included with all distributions of the Source Code. - Except to the extent prohibited by statute or regulation, such description must be - sufficiently detailed for a recipient of ordinary skill to be able to understand it. - <h3 id="section-5">5. Application of this License.</h3> - <p>This License applies to code to which the Initial Developer has attached the notice in - <a href="#exhibit-a">Exhibit A</a> and to related Covered Code. - <h3 id="section-6">6. Versions of the License.</h3> - - <h4 id="section-6.1">6.1. New Versions</h4> - <p>The <u>H2 Group</u> may publish revised and/or new versions - of the License from time to time. Each version will be given a distinguishing version number. - <h4 id="section-6.2">6.2. Effect of New Versions</h4> - <p>Once Covered Code has been published under a particular version of the License, You may - always continue to use it under the terms of that version. You may also choose to use such - Covered Code under the terms of any subsequent version of the License published by the <u>H2 Group</u>. - No one other than the <u>H2 Group</u> has the right to modify the terms applicable to Covered Code - created under this License. - <h4 id="section-6.3">6.3. Derivative Works</h4> - <p>If You create or use a modified version of this License (which you may only do in order to - apply it to code which is not already Covered Code governed by this License), You must (a) - rename Your license so that the phrases <u>"H2 Group", "H2"</u> - or any confusingly similar phrase do not appear in your license (except to note that - your license differs from this License) and (b) otherwise make it clear that Your version of - the license contains terms which differ from the <u>H2 License</u>. - (Filling in the name of the Initial Developer, Original Code or Contributor in the - notice described in <a href="#exhibit-a">Exhibit A</a> shall not of themselves be deemed to - be modifications of this License.) - <h3 id="section-7">7. Disclaimer of Warranty</h3> - <p>Covered code is provided under this license on an "as is" - basis, without warranty of any kind, either expressed or implied, including, without - limitation, warranties that the covered code is free of defects, merchantable, fit for a - particular purpose or non-infringing. The entire risk as to the quality and performance of - the covered code is with you. Should any covered code prove defective in any respect, you - (not the initial developer or any other contributor) assume the cost of any necessary - servicing, repair or correction. This disclaimer of warranty constitutes an essential part - of this license. No use of any covered code is authorized hereunder except under this - disclaimer. - <h3 id="section-8">8. Termination</h3> - <p id="section-8.1">8.1. This License and the rights granted hereunder will terminate - automatically if You fail to comply with terms herein and fail to cure such breach - within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which - are properly granted shall survive any termination of this License. Provisions which, by - their nature, must remain in effect beyond the termination of this License shall survive. - <p id="section-8.2">8.2. If You initiate litigation by asserting a patent infringement - claim (excluding declaratory judgment actions) against Initial Developer or a Contributor - (the Initial Developer or Contributor against whom You file such action is referred to - as "Participant") alleging that: - <ol type="a"> - <li id="section-8.2-a">such Participant's Contributor Version directly or indirectly - infringes any patent, then any and all rights granted by such Participant to You under - Sections <a href="#section-2.1">2.1</a> and/or <a href="#section-2.2">2.2</a> of this - License shall, upon 60 days notice from Participant terminate prospectively, unless if - within 60 days after receipt of notice You either: (i) agree in writing to pay - Participant a mutually agreeable reasonable royalty for Your past and future use of - Modifications made by such Participant, or (ii) withdraw Your litigation claim with - respect to the Contributor Version against such Participant. If within 60 days of - notice, a reasonable royalty and payment arrangement are not mutually agreed upon in - writing by the parties or the litigation claim is not withdrawn, the rights granted by - Participant to You under Sections <a href="#section-2.1">2.1</a> and/or - <a href="#section-2.2">2.2</a> automatically terminate at the expiration of the 60 day - notice period specified above. - <li id="section-8.2-b">any software, hardware, or device, other than such Participant's - Contributor Version, directly or indirectly infringes any patent, then any rights - granted to You by such Participant under Sections 2.1(<a href="#section-2.1-b">b</a>) - and 2.2(<a href="#section-2.2-b">b</a>) are revoked effective as of the date You first - made, used, sold, distributed, or had made, Modifications made by that Participant. - </ol> - <p id="section-8.3">8.3. If You assert a patent infringement claim against Participant - alleging that such Participant's Contributor Version directly or indirectly infringes - any patent where such claim is resolved (such as by license or settlement) prior to the - initiation of patent infringement litigation, then the reasonable value of the licenses - granted by such Participant under Sections <a href="#section-2.1">2.1</a> or - <a href="#section-2.2">2.2</a> shall be taken into account in determining the amount or - value of any payment or license. - <p id="section-8.4">8.4. In the event of termination under Sections - <a href="#section-8.1">8.1</a> or <a href="#section-8.2">8.2</a> above, all end user - license agreements (excluding distributors and resellers) which have been validly - granted by You or any distributor hereunder prior to termination shall survive - termination. - <h3 id="section-9">9. Limitation of Liability</h3> - - <p>Under no circumstances and under no legal theory, whether - tort (including negligence), contract, or otherwise, shall you, the initial developer, - any other contributor, or any distributor of covered code, or any supplier of any of - such parties, be liable to any person for any indirect, special, incidental, or - consequential damages of any character including, without limitation, damages for loss - of goodwill, work stoppage, computer failure or malfunction, or any and all other - commercial damages or losses, even if such party shall have been informed of the - possibility of such damages. This limitation of liability shall not apply to liability - for death or personal injury resulting from such party's negligence to the extent - applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion - or limitation of incidental or consequential damages, so this exclusion and limitation - may not apply to you. - <h3 id="section-10">10. United States Government End Users</h3> - <p>The Covered Code is a "commercial item", as that term is defined in 48 - C.F.R. 2.101 (October 1995), consisting of - "commercial computer software" and "commercial computer software documentation", as such - terms are used in 48 C.F.R. 12.212 (September 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. - 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users - acquire Covered Code with only those rights set forth herein. - <h3 id="section-11">11. Miscellaneous</h3> - <p>This License represents the complete agreement concerning subject matter hereof. If - any provision of this License is held to be unenforceable, such provision shall be - reformed only to the extent necessary to make it enforceable. This License shall be - governed by <u>Swiss</u> law provisions (except to the extent applicable law, if any, - provides otherwise), excluding its conflict-of-law provisions. With respect to - disputes in which at least one party is a citizen of, or an entity chartered or - registered to do business in <u>Switzerland</u>, any litigation relating to - this License shall be subject to the jurisdiction of <u>Switzerland</u>, - with the losing party responsible for costs, including without limitation, court - costs and reasonable attorneys' fees and expenses. The application of the United - Nations Convention on Contracts for the International Sale of Goods is expressly - excluded. Any law or regulation which provides that the language of a contract - shall be construed against the drafter shall not apply to this License. - <h3 id="section-12">12. Responsibility for Claims</h3> - - <p>As between Initial Developer and the Contributors, each party is responsible for - claims and damages arising, directly or indirectly, out of its utilization of rights - under this License and You agree to work with Initial Developer and Contributors to - distribute such responsibility on an equitable basis. Nothing herein is intended or - shall be deemed to constitute any admission of liability. - <h3 id="section-13">13. Multiple-Licensed Code</h3> - <p>Initial Developer may designate portions of the Covered Code as - "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits - you to utilize portions of the Covered Code under Your choice of this - or the alternative licenses, if any, specified by the Initial Developer in the file - described in <a href="#exhibit-a">Exhibit A</a>. - <h3 id="exhibit-a">Exhibit A</h3> - -<pre> -Licensed under the H2 License, Version 1.0 (http://h2database.com/html/license.html). -Initial Developer: H2 Group -</pre> - -</div></td></tr></table></body></html> Deleted: chat/trunk/licenses/LICENSE.hsqldb.txt =================================================================== --- chat/trunk/licenses/LICENSE.hsqldb.txt 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/licenses/LICENSE.hsqldb.txt 2008-11-20 00:00:58 UTC (rev 1377) @@ -1,64 +0,0 @@ -/* Copyright (c) 1995-2000, The Hypersonic SQL Group. - * 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 Hypersonic SQL Group 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 HYPERSONIC SQL GROUP, - * 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. - * - * This software consists of voluntary contributions made by many individuals - * on behalf of the Hypersonic SQL Group. - * - * - * For work added by the HSQL Development Group: - * - * Copyright (c) 2001-2004, The HSQL Development Group - * 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 HSQL Development Group 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 HSQL DEVELOPMENT GROUP, HSQLDB.ORG, - * 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. - */ Deleted: chat/trunk/licenses/LICENSE.was_uow.html =================================================================== --- chat/trunk/licenses/LICENSE.was_uow.html 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/licenses/LICENSE.was_uow.html 2008-11-20 00:00:58 UTC (rev 1377) @@ -1,18 +0,0 @@ -You may use or redistribute the files or modules contained in this jar subject to the following terms: - -The WebSphere Application Server files or modules contained in this jar -may be redistrubuted as provided by IBM to you, and only as part of Your -application distribution. - -You may not use IBM's name or trademarks in connection with the marketing -of Your applications without IBM's prior written consent. - -IBM PROVIDES THESE FILES OR MODULES ON AN "AS IS" BASIS AND IBM DISCLAIMS -ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -WARRANTY OF NON-INFRINGEMENT AND THE IMPLIED WARRANTIES OF MERCHANTABILITY -OR FITNESS FOR A PARTICULAR PURPOSE. IBM SHALL NOT BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT -OF THE USE OR OPERATION OF THE FILES OR MODULES . IBM HAS NO OBLIGATION -TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR MODIFICATIONS TO -THE FILES OR MODULES . - Modified: chat/trunk/pom.xml =================================================================== --- chat/trunk/pom.xml 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/pom.xml 2008-11-20 00:00:58 UTC (rev 1377) @@ -1,272 +1,180 @@ -<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>jp.sf.pal.chat</groupId> - <artifactId>chat</artifactId> - <version>0.0.1</version> - <packaging>war</packaging> - <name>chat</name> - <build> - <sourceDirectory>src/main/java</sourceDirectory> - <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - <testOutputDirectory>target/test-classes</testOutputDirectory> - <testSourceDirectory>src/test/java</testSourceDirectory> - <testResources> - <testResource> - <directory>src/test/resources</directory> - </testResource> - </testResources> - <defaultGoal>validate</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>source-jar</id> - <phase>package</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <wtpversion>1.5</wtpversion> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - <pluginRepositories> - <pluginRepository> - <id>maven.seasar.org</id> - <name>The Seasar Foundation Maven2 Repository</name> - <url>http://maven.seasar.org/maven2</url> - </pluginRepository> - </pluginRepositories> - <repositories> - <repository> - <id>local</id> - <name>Local Repository</name> - <url>file:repo</url> - </repository> - <repository> - <id>maven.seasar.org</id> - <name>The Seasar Foundation Maven2 Repository</name> - <url>http://maven.seasar.org/maven2</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jsp_2.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-servlet_2.4_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - <dependency> - <groupId>junit-addons</groupId> - <artifactId>junit-addons</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - <version>2.7.7</version> - </dependency> - <dependency> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>commons-el</groupId> - <artifactId>commons-el</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.3.2</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>commons-validator</groupId> - <artifactId>commons-validator</artifactId> - <version>1.2.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-annotation_1.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-ejb_3.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-interceptor_3.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_3.0_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.69</version> - </dependency> - <dependency> - <groupId>oro</groupId> - <artifactId>oro</artifactId> - <version>2.0.8</version> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - <version>3.4.ga</version> - </dependency> - <dependency> - <groupId>jstl</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - <dependency> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - <version>2.6.9-patch-20070908</version> - </dependency> - <dependency> - <groupId>poi</groupId> - <artifactId>poi</artifactId> - <version>3.0-FINAL</version> - </dependency> - <dependency> - <groupId>org.seasar.dao</groupId> - <artifactId>s2-dao</artifactId> - <version>1.0.48</version> - </dependency> - <dependency> - <groupId>org.seasar.dao</groupId> - <artifactId>s2-dao-tiger</artifactId> - <version>1.0.48</version> - </dependency> - <dependency> - <groupId>org.seasar.container</groupId> - <artifactId>s2-extension</artifactId> - <version>2.4.29</version> - </dependency> - <dependency> - <groupId>org.seasar.container</groupId> - <artifactId>s2-framework</artifactId> - <version>2.4.29</version> - </dependency> - <dependency> - <groupId>org.seasar.container</groupId> - <artifactId>s2-tiger</artifactId> - <version>2.4.29</version> - </dependency> - <dependency> - <groupId>org.seasar.sastruts</groupId> - <artifactId>sa-struts</artifactId> - <version>1.0.4-sp1</version> - </dependency> - <dependency> - <groupId>struts</groupId> - <artifactId>struts</artifactId> - <version>1.2.9</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.3</version> - </dependency> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>jp.sf.pal.chat</groupId> + <artifactId>chat</artifactId> + <version>0.0.1</version> + <packaging>war</packaging> + <name>chat</name> + <build> + <finalName>chat</finalName> + <defaultGoal>validate</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>source-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <pluginRepositories> + <pluginRepository> + <id>maven.seasar.org</id> + <name>The Seasar Foundation Maven2 Repository</name> + <url>http://maven.seasar.org/maven2</url> + </pluginRepository> + </pluginRepositories> + <repositories> + <repository> + <id>maven.seasar.org</id> + <name>The Seasar Foundation Maven2 Repository</name> + <url>http://maven.seasar.org/maven2</url> + </repository> + </repositories> + <dependencies> <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.7</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>portlet-api</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + <dependency> + <groupId>jstl</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>commons-el</groupId> + <artifactId>commons-el</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + <dependency> + <groupId>commons-validator</groupId> + <artifactId>commons-validator</artifactId> + <version>1.2.0</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + <type>jar</type> + </dependency> +<!-- SAStruts --> + <dependency> + <groupId>org.seasar.container</groupId> + <artifactId>s2-extension</artifactId> + <version>2.4.29</version> + </dependency> + <dependency> + <groupId>org.seasar.container</groupId> + <artifactId>s2-tiger</artifactId> + <version>2.4.29</version> + </dependency> + <dependency> <groupId>org.seasar.sastruts</groupId> <artifactId>sa-struts-portlet</artifactId> <version>1.0.0-rc3</version> - <exclusions> - <exclusion> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - </exclusion> - <exclusion> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> - </dependencies> +<!-- Geronimo --> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-annotation_1.0_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-ejb_3.0_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-interceptor_3.0_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jsp_2.0_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-servlet_2.4_spec</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_3.0_spec</artifactId> + <version>1.0</version> + </dependency> + </dependencies> </project> Modified: chat/trunk/src/main/resources/app.dicon =================================================================== --- chat/trunk/src/main/resources/app.dicon 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/resources/app.dicon 2008-11-20 00:00:58 UTC (rev 1377) @@ -4,7 +4,7 @@ <components> <include path="convention.dicon"/> <include path="aop.dicon"/> - <include path="dao.dicon"/> + <!--include path="dao.dicon"/--> <include path="dxo.dicon"/> <include path="j2ee.dicon"/> <component name="actionMessagesThrowsInterceptor" class="org.seasar.struts.interceptor.ActionMessagesThrowsInterceptor"/> Modified: chat/trunk/src/main/resources/jdbc.dicon =================================================================== --- chat/trunk/src/main/resources/jdbc.dicon 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/resources/jdbc.dicon 2008-11-20 00:00:58 UTC (rev 1377) @@ -38,6 +38,7 @@ --> <!-- for H2 --> +<!-- <component name="xaDataSource" class="org.seasar.extension.dbcp.impl.XADataSourceImpl"> <property name="driverClassName"> @@ -52,6 +53,7 @@ @org.seasar.framework.util.DriverManagerUtil @ deregisterAllDrivers() </destroyMethod> </component> +--> <!-- for Oracle --> <!-- @@ -180,4 +182,4 @@ <component name="dataSource" class="org.seasar.extension.datasource.impl.SelectableDataSourceProxy"/> --> -</components> \ No newline at end of file +</components> Deleted: chat/trunk/src/main/webapp/WEB-INF/view/common/footer.jsp =================================================================== --- chat/trunk/src/main/webapp/WEB-INF/view/common/footer.jsp 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/webapp/WEB-INF/view/common/footer.jsp 2008-11-20 00:00:58 UTC (rev 1377) @@ -1 +0,0 @@ -footer \ No newline at end of file Deleted: chat/trunk/src/main/webapp/WEB-INF/view/common/header.jsp =================================================================== --- chat/trunk/src/main/webapp/WEB-INF/view/common/header.jsp 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/webapp/WEB-INF/view/common/header.jsp 2008-11-20 00:00:58 UTC (rev 1377) @@ -1 +0,0 @@ -header \ No newline at end of file Deleted: chat/trunk/src/main/webapp/WEB-INF/view/common/layout.jsp =================================================================== --- chat/trunk/src/main/webapp/WEB-INF/view/common/layout.jsp 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/webapp/WEB-INF/view/common/layout.jsp 2008-11-20 00:00:58 UTC (rev 1377) @@ -1,15 +0,0 @@ -<html> -<head> -<title><tiles:getAsString name="title" /></title> -</head> -<body> -<table width="100%"> - <tr><td colspan="2"><tiles:insert page="/common/header.jsp" /></td></tr> - <tr> - <td width="20%"><tiles:insert page="/common/menu.jsp" /></td> - <td><tiles:insert attribute="content" /></td> - </tr> - <tr><td colspan="2"><tiles:insert page="/common/footer.jsp" /></td></tr> -</table> -</body> -</html> \ No newline at end of file Deleted: chat/trunk/src/main/webapp/WEB-INF/view/common/menu.jsp =================================================================== --- chat/trunk/src/main/webapp/WEB-INF/view/common/menu.jsp 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/webapp/WEB-INF/view/common/menu.jsp 2008-11-20 00:00:58 UTC (rev 1377) @@ -1,3 +0,0 @@ -<ul> -<li><s:link href="#">appName</s:link></li> -</ul> \ No newline at end of file Modified: chat/trunk/src/main/webapp/WEB-INF/web.xml =================================================================== --- chat/trunk/src/main/webapp/WEB-INF/web.xml 2008-11-19 11:03:18 UTC (rev 1376) +++ chat/trunk/src/main/webapp/WEB-INF/web.xml 2008-11-20 00:00:58 UTC (rev 1377) @@ -126,7 +126,7 @@ <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class> <init-param> <param-name>contextName</param-name> - <param-value>todolist</param-value> + <param-value>chat</param-value> </init-param> <load-on-startup>0</load-on-startup> </servlet>