February 2011 - Bow-commits - mailman.cloud.codelutin.com

r227 - trunk/bow-ui
by kmorin＠users.chorem.org 25 Feb '11

25 Feb '11

Author: kmorin Date: 2011-02-25 18:31:10 +0100 (Fri, 25 Feb 2011) New Revision: 227 Url: http://chorem.org/repositories/revision/bow/227 Log: - debug module name Modified: trunk/bow-ui/pom.xml Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2011-02-25 17:09:22 UTC (rev 226) +++ trunk/bow-ui/pom.xml 2011-02-25 17:31:10 UTC (rev 227) @@ -267,8 +267,8 @@ <artifactItems> <artifactItem> <groupId>org.chorem</groupId> - <artifactId>bow-ext</artifactId> - <version>0.5-SNAPSHOT</version> + <artifactId>bow-extension-chromium</artifactId> + <version>${project.version}</version> <type>crx</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/${project.build.finalName}/extensions/</outputDirectory>

1 0

r226 - in trunk: . bow-extension-chromium
by kmorin＠users.chorem.org 25 Feb '11

25 Feb '11

Author: kmorin Date: 2011-02-25 18:09:22 +0100 (Fri, 25 Feb 2011) New Revision: 226 Url: http://chorem.org/repositories/revision/bow/226 Log: - format pom - remove folder which should not be here Removed: trunk/bow/ Modified: trunk/bow-extension-chromium/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2011-02-25 17:04:26 UTC (rev 225) +++ trunk/bow-extension-chromium/pom.xml 2011-02-25 17:09:22 UTC (rev 226) @@ -1,65 +1,65 @@ <?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/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.chorem</groupId> - <artifactId>bow</artifactId> - <version>0.5-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.5-SNAPSHOT</version> + </parent> - <artifactId>bow-extension-chromium</artifactId> + <artifactId>bow-extension-chromium</artifactId> -  -  -  - - <name>BOW :: Chromium extension</name> - <description>Chromium extension for BOW</description> - <inceptionYear>2011</inceptionYear> +  +  +  -  -  -  - - <packaging>crx</packaging> - - <properties> - <crx.pemKey>${basedir}/key.pem</crx.pemKey> - <crx.pemCert>${basedir}/cert.pem</crx.pemCert> - </properties> + <name>BOW :: Chromium extension</name> + <description>Chromium extension for BOW</description> + <inceptionYear>2011</inceptionYear> - <build> - <plugins> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <executions> - <execution> - <id>stage-crx</id> - <phase>prepare-package</phase> - <goals> - <goal>exploded</goal> - </goals> - </execution> - </executions> - </plugin> +  +  +  -  - <plugin> - <groupId>com.google.code</groupId> - <artifactId>crx-maven-plugin</artifactId> - <extensions>true</extensions> - </plugin> + <packaging>crx</packaging> - </plugins> - </build> + <properties> + <crx.pemKey>${basedir}/key.pem</crx.pemKey> + <crx.pemCert>${basedir}/cert.pem</crx.pemCert> + </properties> + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>stage-crx</id> + <phase>prepare-package</phase> + <goals> + <goal>exploded</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>com.google.code</groupId> + <artifactId>crx-maven-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + </plugins> + </build> + </project> \ No newline at end of file

1 0

r225 - trunk
by kmorin＠users.chorem.org 25 Feb '11

25 Feb '11

Author: kmorin Date: 2011-02-25 18:04:26 +0100 (Fri, 25 Feb 2011) New Revision: 225 Url: http://chorem.org/repositories/revision/bow/225 Log: Added: trunk/bow/

1 0

25 Feb '11

Author: kmorin Date: 2011-02-25 17:57:19 +0100 (Fri, 25 Feb 2011) New Revision: 224 Url: http://chorem.org/repositories/revision/bow/224 Log: Evolution #284 Multimodule Added: trunk/bow-extension-chromium/ trunk/bow-extension-chromium/LICENSE.txt trunk/bow-extension-chromium/README.txt trunk/bow-extension-chromium/cert.pem trunk/bow-extension-chromium/changelog.txt trunk/bow-extension-chromium/key.pem trunk/bow-extension-chromium/pom.xml trunk/bow-extension-chromium/src/ trunk/bow-extension-chromium/src/main/ trunk/bow-extension-chromium/src/main/webapp/ trunk/bow-extension-chromium/src/main/webapp/_locales/ trunk/bow-extension-chromium/src/main/webapp/_locales/en/ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json trunk/bow-extension-chromium/src/main/webapp/_locales/fr/ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json trunk/bow-extension-chromium/src/main/webapp/background.html trunk/bow-extension-chromium/src/main/webapp/css/ trunk/bow-extension-chromium/src/main/webapp/css/extension.css trunk/bow-extension-chromium/src/main/webapp/css/options.css trunk/bow-extension-chromium/src/main/webapp/img/ trunk/bow-extension-chromium/src/main/webapp/img/favicon.png trunk/bow-extension-chromium/src/main/webapp/img/fdboutonV.jpg trunk/bow-extension-chromium/src/main/webapp/img/fondconnexion.jpg trunk/bow-extension-chromium/src/main/webapp/img/fondhead.jpg trunk/bow-extension-chromium/src/main/webapp/img/logobow.jpg trunk/bow-extension-chromium/src/main/webapp/img/moyen-livre.jpg trunk/bow-extension-chromium/src/main/webapp/img/ptit-livre.jpg trunk/bow-extension-chromium/src/main/webapp/manifest.json trunk/bow-extension-chromium/src/main/webapp/options.html trunk/bow-extension-chromium/src/main/webapp/popup.html trunk/bow-extension-chromium/src/main/webapp/properties.js trunk/bow-ui/ trunk/bow-ui/LICENSE.txt trunk/bow-ui/README.txt trunk/bow-ui/changelog.txt trunk/bow-ui/pom.xml trunk/bow-ui/src/ Removed: trunk/bow-ui/src/main/webapp/extensions/ trunk/src/ Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl trunk/bow-ui/src/main/xmi/README trunk/bow-ui/src/main/xmi/bow-0.4.zargo trunk/pom.xml Added: trunk/bow-extension-chromium/LICENSE.txt =================================================================== --- trunk/bow-extension-chromium/LICENSE.txt (rev 0) +++ trunk/bow-extension-chromium/LICENSE.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/bow-extension-chromium/LICENSE.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/README.txt =================================================================== --- trunk/bow-extension-chromium/README.txt (rev 0) +++ trunk/bow-extension-chromium/README.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,2 @@ +Bow : Bookmark on the web +http://www.chorem.org/projects/show/bow Property changes on: trunk/bow-extension-chromium/README.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/cert.pem =================================================================== --- trunk/bow-extension-chromium/cert.pem (rev 0) +++ trunk/bow-extension-chromium/cert.pem 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,6 @@ +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC3upb6K/xHuNfkNjzY4arR4djT +L8XwtiIU7kvE4b1+QUUtuQJ6cLZf0g7rRrbF2+EILnvdXTYnt3sbGxpgL9xQI7bT +i1zRS+m/cqjSV0L7ZJEk+lodYyF6vH0T8gsCypcXrA+bIds6Hxc9CGZyjitaCbV0 +V9lggUxXVXZLwGTcgQIDAQAB +-----END PUBLIC KEY----- Property changes on: trunk/bow-extension-chromium/cert.pem ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-extension-chromium/changelog.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/key.pem =================================================================== --- trunk/bow-extension-chromium/key.pem (rev 0) +++ trunk/bow-extension-chromium/key.pem 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALe6lvor/Ee41+Q2 +PNjhqtHh2NMvxfC2IhTuS8ThvX5BRS25Anpwtl/SDutGtsXb4Qgue91dNie3exsb +GmAv3FAjttOLXNFL6b9yqNJXQvtkkST6Wh1jIXq8fRPyCwLKlxesD5sh2zofFz0I +ZnKOK1oJtXRX2WCBTFdVdkvAZNyBAgMBAAECgYEAsJr3DTrCod6YB5HrIz6oiF7j +oPzG8/7e++ejhXjIQVhUOwMf0roNVEYCeT3b6ozU3pxwC/TRXZQNDZ0b2WGoDu6h +qB2nq70RXDLUwaPzY4w1zIZJtZL8uDI1t1H/D3bNvn2NJV5u3Fjh62b/K0wpcGPF +qt2XayZcOv+nN2C08AECQQDoCI4TRyZl+xbRfZD5CYNcnGgJPuFe0nIHmiymARj/ +MV0MI3wKqFMbxaaigzm19CwCtAKtfVzhN+wwAFo/aithAkEAyrTDH37pvKwv1n9r +/F198xRA5kmoxrWOv+psYLzoSp7PsayeF7fTEbH2VM8z7Ass3kt1ZBBDSfaZ8eg4 +T5hlIQJAeJCBakjtDc5i8+Vf39bul795W1x99Cw7LfIRQwyM9YSryXPirxL5ZBPW +Wtj+sqm1+I2aWpUqHqhVJDf6rLq44QJAGfc7w24TbNq1qglagNJNDvU6NwWafBHH +vme+CEpKizx6qGzPN4SRogOk5UpBgWwRDEyoNfArXm8bWzR++hswYQJAIdU9ZGku +ggnOvTmRtEv5M+dr4yjf2t3pflvbNIf6biHxf8ZNlwKeuD+32HGgvsRMuUwPqEK2 +NGsnreHsq4WuBg== +-----END PRIVATE KEY----- Property changes on: trunk/bow-extension-chromium/key.pem ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml (rev 0) +++ trunk/bow-extension-chromium/pom.xml 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,65 @@ +<?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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.5-SNAPSHOT</version> + </parent> + + <artifactId>bow-extension-chromium</artifactId> + +  +  +  + + <name>BOW :: Chromium extension</name> + <description>Chromium extension for BOW</description> + <inceptionYear>2011</inceptionYear> + +  +  +  + + <packaging>crx</packaging> + + <properties> + <crx.pemKey>${basedir}/key.pem</crx.pemKey> + <crx.pemCert>${basedir}/cert.pem</crx.pemCert> + </properties> + + <build> + <plugins> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <executions> + <execution> + <id>stage-crx</id> + <phase>prepare-package</phase> + <goals> + <goal>exploded</goal> + </goals> + </execution> + </executions> + </plugin> + +  + <plugin> + <groupId>com.google.code</groupId> + <artifactId>crx-maven-plugin</artifactId> + <extensions>true</extensions> + </plugin> + + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: trunk/bow-extension-chromium/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,91 @@ +{ + "extensionName": { + "message": "BOW extension", + "description": "extension name" + }, + + "extensionDescription": { + "message": "BOW extension", + "description": "extension description" + }, + + "actionTitle": { + "message": "Bookmark this page in BOW", + "description": "action title" + }, + + "nameInputLabel": { + "message": "Name:", + "description": "label for name input" + }, + + "aliasInputLabel": { + "message": "Alias:", + "description": "label for alias input" + }, + + "tagsInputLabel": { + "message": "Tags:", + "description": "label for tags input" + }, + + "permanentTokenButton": { + "message": "Permanent token", + "description": "button to bookmark the page using the permanent token" + }, + + "emptyPermanentTokenMessage": { + "message": "You did not add your permanent token in the options. Please add it to be able to add bookmarks or use a session token.", + "description": "message when the user tries to ad bokkmark using his permanent token, but did not add it in the option" + }, + + "sessionTokenButton": { + "message": "Session token", + "description": "button to bookmark the page using the session token" + }, + + "noTokenMessage": { + "message": "You need to add either your permanent token or a session to token to be able to add a page in your BOW bookmarks.", + "description": "message displayed instead of the buttons when the user did not add his token ids" + }, + + "optionTitle": { + "message": "Options:", + "description": "option title" + }, + + "sessionTokenIdInputLabel": { + "message": "Session token ID:", + "description": "label for session token ID input" + }, + + "permanentTokenIdInputLabel": { + "message": "Permanent token ID:", + "description": "label for permanent token ID input" + }, + + "saveOptionButton": { + "message": "Save", + "description": "button to save options" + }, + + "licenseLink": { + "message": "AGPL license", + "description": "link to the license" + }, + + "bugReport": { + "message": "Bug report", + "description": "link to the bug report" + }, + + "userSupport": { + "message": "User support", + "description": "link to the user support" + }, + + "optionSavedMessage": { + "message": "Your options have been saved.", + "description": "message displayed when the user saves his options" + } +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,86 @@ +{ + "extensionName" : { + "message" : "Extension pour BOW", + "description" : "nom de l'extension" + }, + + "extensionDescription" : { + "message" : "Extension pour BOW", + "description" : "description de l'extension" + }, + + "actionTitle" : { + "message" : "Bookmarker cette page dans BOW", + "description" : "titre de l'action" + }, + + "nameInputLabel" : { + "message" : "Nom :", + "description" : "label pour l'input du nom" + }, + + "aliasInputLabel" : { + "message" : "Alias :", + "description" : "label pour l'input de l'alias" + }, + + "tagsInputLabel" : { + "message" : "Tags :", + "description" : "label pour l'input des tags" + }, + + "permanentTokenButton": { + "message": "Token permanent", + "description": "bouton pour bookmarker la page avec le token permanent" + }, + + "sessionTokenButton": { + "message": "Token de session", + "description": "bouton pour bookmarker la page avec le token de session" + }, + + "noTokenMessage": { + "message": "Vous devez renseigner votre identifiant de token permanent ou de token de session pour pouvoir bookmarker cette page dans BOW.", + "description": "message affiché à la place des boutons quand l'utilisateur n'a pas entré ses token ids" + }, + + "optionTitle" : { + "message" : "Options :", + "description" : "titre des options" + }, + + "sessionTokenIdInputLabel" : { + "message" : "Id du token de session :", + "description" : "label pour l'input de l'id du token de session" + }, + + "permanentTokenIdInputLabel" : { + "message" : "Id du token permanent :", + "description" : "label pour l'input de l'id du token permanent" + }, + + "saveOptionButton" : { + "message" : "Enregistrer", + "description" : "bouton d'enregistrement des options" + }, + + "licenseLink" : { + "message" : "Licence AGPL", + "description" : "lien vers la licence" + }, + + "bugReport" : { + "message" : "Rapport de bug", + "description" : "lien vers le rapport de bug" + }, + + "userSupport" : { + "message" : "Support utilisateur", + "description" : "lien vers le support utilisateur" + }, + + "optionSavedMessage": { + "message": "Vos options ont été enregistrées.", + "description": "message affiché quand l'utilisateur a enregistré ses options" + } +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/background.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/background.html (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/background.html 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,57 @@ + +<html> + <head> + <script> + var tabInfos = new Array(); + var currentTabId; + + function getTabInfos() { + return tabInfos[currentTabId]; + }; + + // Called when the url of a tab changes. + function showAction(tabId, changeInfo, tab) { + // ... show the page action. + chrome.pageAction.show(tabId); + tabInfos[tabId] = { + "title" : tab.title, + "url" : tab.url + }; + }; + + // Listen for any changes to the URL of any tab. + chrome.tabs.onUpdated.addListener(showAction); + + function updateCurrentTabId(tabId, selectInfo) { + currentTabId = tabId; + }; + + // Listen for any tab selection changes. + chrome.tabs.onSelectionChanged.addListener(updateCurrentTabId); + + </script> + </head> +</html> + Property changes on: trunk/bow-extension-chromium/src/main/webapp/background.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/css/extension.css =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/css/extension.css (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/css/extension.css 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,68 @@ +/* + * #%L + * bow + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +body { + width: 330px; + height: 288px; + font-size: 12px; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + background: #9EDCF8 url('/img/fondconnexion.jpg') no-repeat; + color: #804561; + padding: 5px 10px 5px 10px; +} + +h1 { + font-size: 18px; + width: 100%; + text-align: center; + margin-bottom: 20px; +} + +input[type="button"] { + float: right; + background: url('/img/fdboutonV.jpg') repeat-x; + color: #FFFFFF; + font-weight: bold; + border: none; + width: auto; + padding: 5px; + cursor: pointer; +} + +.labels { + margin-top: 10px; +} + +.inputs { + width: 100%; +} + +input[type="text"] { + width: 100%; +} + +#buttons { + width: 100%; + margin-top: 30px; + height: 30px; + text-align: center; + text-color: red; +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/css/extension.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/css/options.css =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/css/options.css (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/css/options.css 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,161 @@ +/* + * #%L + * bow + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +@charset "utf-8"; +/* CSS Document */ +* { + padding: 0; + margin: 0; +} + +body { + font-size: 10px; + font-family: Verdana, Arial, Helvetica, sans-serif; +} + +#wrap { + clear: both; + float: left; + overflow-x: hidden; + overflow-y: visible; + position: relative; + width: 100%; + background-color: #9EDCF8; +} + +#footer { + background-color: #804561; + padding-top: 30px; +} + +#footer a { + color: #bf8a9c; +} + +#footer p { + font-size: 14px; + text-align: center; + line-height: 50px; +} + +#header { + background: #FFFFFF url('/img/fondhead.jpg') repeat-x; + width: 100%; + float: left; + height: 100px; + clear: both; + margin: 0 auto; + position: relative; +} + +#header a.logo { + background: url('/img/logobow.jpg'); + width: 290px; + height: 100px; + text-indent: -99999px; + display: block; +} + +#main { + width: 1004px; + margin: 0 auto; + position: relative; + clear: both; +} + +#page { + width: 100%; + margin: 0 auto; + clear: both; +} + +#content { + width: 1004px; + position: relative; + margin: 0 auto; + padding-top: 20px; +} + +#formFrame { + width: 225px; + height: 315px; + background: url('/img/fondconnexion.jpg') no-repeat; + position: relative; + margin: 100px auto; + padding: 10px 70px; +} + +#formFrame h1 { + color: #804561; + width: 225px; + position: relative; + margin: 15px auto; +} + +#formFrame div div { + color: #804561; + font-size: 16px; + font-weight: bold; + width: 225px; +} + +.label { + margin-top: 30px; +} + +.buttons { + position: absolute; + top: 250px; + text-align: center; +} + +#formFrame input[type="text"] { + width: 225px; +} + +#formFrame a { + position: absolute; + color: #804561; + left: 75px; + font-weight: bold; + font-size: 12px; +} + +#formFrame .message { + width: 100%; + color: green; + font-size: 12px; + text-align: center; + margin-top: 30px; +} + +#formFrame input[type="button"] { + background: url('/img/fdboutonV.jpg') repeat-x; + height: 31px; + color: #FFFFFF; + font-weight: bold; + border: none; + width: auto; + padding: 5px; + cursor: pointer; +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/css/options.css ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/img/favicon.png =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/favicon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/fdboutonV.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/fdboutonV.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/fondconnexion.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/fondconnexion.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/fondhead.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/fondhead.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/logobow.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/logobow.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/moyen-livre.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/moyen-livre.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/img/ptit-livre.jpg =================================================================== (Binary files differ) Property changes on: trunk/bow-extension-chromium/src/main/webapp/img/ptit-livre.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,23 @@ +{ + "name": "__MSG_extensionName__", + "version": "1.0", + "default_locale": "en", + + "description": "__MSG_extensionDescription__", + "icons": { "16": "img/ptit-livre.jpg", + "48": "img/moyen-livre.jpg", + "128": "img/moyen-livre.jpg" }, + + "page_action": { + "default_title": "__MSG_actionTitle__", + "default_icon": "img/favicon.png", + "default_popup": "popup.html" + }, + + "background_page": "background.html", + "options_page": "options.html", + "homepage_url": "http://www.codelutin.com", + "permissions": [ + "tabs", "http://bow.chorem.org/bow/*" + ] +} Property changes on: trunk/bow-extension-chromium/src/main/webapp/manifest.json ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/options.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/options.html (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/options.html 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,142 @@ + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> + <meta name="description" content="Bookmarks On the Web" /> + + <title>BOW Extension Options</title> + + <link rel="icon" type="image/png" href="img/favicon.png" /> + <link rel="stylesheet" type="text/css" href="css/options.css" /> + + <script type="text/javascript" src="properties.js"></script> + <script type="text/javascript"> +  + </script> +</head> +<body onload="restore_options()"> + <div id="wrap"> + <div id="page"> + <div id="header"> + <a class="logo" id="bow_logo" href="#">bow</a> + </div> + <div id="main"> + <div id="content"> + <div id="formFrame"> + <h1 id="title"></h1> + <div> + <div class="label"> + <label for="sessionTokenIdInput" id="sessionTokenIdInputLabel"></label> + </div> + <div class="inputs"> + <input type="text" name="sessionTokenIdInput" id="sessionTokenIdInput" /> + </div> + <div class="label"> + <label for="permanentTokenIdInput" id="permanentTokenIdInputLabel"></label> + </div> + <div class="inputs"> + <input type="text" name="permanentTokenIdInput" id="permanentTokenIdInput" /> + </div> + <div class="buttons"> + <input type="button" id="saveOptionButton" onclick="save_options()" /> + </div> + <div class="message" id="formMessage"></div> + </div> + </div> + </div> + </div> + </div> + <div id="footer"> + <p> + <a shape="rect" id="bow_website" href="#" target="_blank">bow</a> + <a shape="rect" href="http://www.chorem.org/projects/list_files/bow">0.3-SNAPSHOT</a> - + <a shape="rect" href="http://www.gnu.org/licenses/agpl.html" id="licenseLink"></a> - + <span title="Copyright">©2010 - 2011</span> + <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - + <a shape="rect" href="http://www.chorem.org/projects/bow/issues" id="bugReport"></a> - + <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users" id="userSupport"></a> + </p> + </div> + </div> +</body> +</html> Property changes on: trunk/bow-extension-chromium/src/main/webapp/options.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/popup.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/popup.html (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,142 @@ + +<html> + <head> + <script type="text/javascript" src="properties.js"></script> + <script> + + function bookmarkPermanent() { + var tokenId = localStorage["permanentTokenId"]; + if (tokenId != null) { + bookmark(tokenId); + } + } + + function bookmarkSession() { + var tokenId = localStorage["sessionTokenId"]; + if (tokenId != null) { + bookmark(tokenId); + } + } + + function bookmark(tokenId) { + var tabInfos = chrome.extension.getBackgroundPage().getTabInfos(); + var url = tabInfos["url"]; + + var nameInput = document.getElementById("nameInput"); + var nameValue = nameInput.value; + + var aliasInput = document.getElementById("aliasInput"); + var aliasValue = aliasInput.value; + + var tagsInput = document.getElementById("tagsInput"); + var tagsValue = tagsInput.value; + + //BOW_URL is defined in properties.js + var link = BOW_URL + "/bow?action=addUrl&token=" + tokenId + + "&url=" + encodeURIComponent(url) + + "&name=" + encodeURIComponent(nameValue) + + "&alias=" + encodeURIComponent(aliasValue) + + "&tags=" + encodeURIComponent(tagsValue); + + var xhr = new XMLHttpRequest(); + xhr.open("GET", link, true); + xhr.send(); + }; + + function init() { + var tabInfos = chrome.extension.getBackgroundPage().getTabInfos(); + + var title = document.getElementById("title"); + title.innerHTML = chrome.i18n.getMessage("actionTitle"); + + var nameInputLabel = document.getElementById("nameInputLabel"); + nameInputLabel.innerHTML = chrome.i18n.getMessage("nameInputLabel"); + + var nameInput = document.getElementById("nameInput"); + nameInput.value = tabInfos["title"]; + + var aliasInputLabel = document.getElementById("aliasInputLabel"); + aliasInputLabel.innerHTML = chrome.i18n.getMessage("aliasInputLabel"); + + var tagsInputLabel = document.getElementById("tagsInputLabel"); + tagsInputLabel.innerHTML = chrome.i18n.getMessage("tagsInputLabel"); + + var sessionTokenId = localStorage["sessionTokenId"]; + var sessionTokenButton = document.getElementById("sessionTokenButton"); + if (!isEmpty(sessionTokenId)) { + sessionTokenButton.value = chrome.i18n.getMessage("sessionTokenButton"); + } else { + sessionTokenButton.style.visibility = "hidden"; + } + + var permanentTokenId = localStorage["permanentTokenId"]; + var permanentTokenButton = document.getElementById("permanentTokenButton"); + if (!isEmpty(permanentTokenId)) { + permanentTokenButton.value = chrome.i18n.getMessage("permanentTokenButton"); + } else { + permanentTokenButton.style.visibility = "hidden"; + } + + if (isEmpty(permanentTokenId) && isEmpty(sessionTokenId)) { + var buttons = document.getElementById("buttons"); + buttons.innerHTML = chrome.i18n.getMessage("noTokenMessage"); + } + }; + + function isEmpty(string) { + return (string == null || string == ""); + } + + </script> + + <link rel="stylesheet" type="text/css" href="css/extension.css" /> + + </head> + <body onLoad="init()"> + <h1 id="title"></h1> + <div class="labels"> + <label for="nameInput" id="nameInputLabel"></label> + </div> + <div class="inputs"> + <input id="nameInput" name="nameInput" type="text" /> + </div> + <div class="labels"> + <label for="aliasInput" id="aliasInputLabel"></label> + </div> + <div class="inputs"> + <input id="aliasInput" name="aliasInput" type="text" /> + </div> + <div class="labels"> + <label for="tagsInput" id="tagsInputLabel"></label> + </div> + <div class="inputs"> + <input id="tagsInput" name="tagsInput" type="text" /> + </div> + <div id="buttons"> + <input id="permanentTokenButton" onclick="bookmarkPermanent()" type="button" /> + <input id="sessionTokenButton" onclick="bookmarkSession()" type="button" /> + </div> + </body> +</html> Property changes on: trunk/bow-extension-chromium/src/main/webapp/popup.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-extension-chromium/src/main/webapp/properties.js =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/properties.js (rev 0) +++ trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1 @@ +var BOW_URL = "http://bow.chorem.org/bow"; Property changes on: trunk/bow-extension-chromium/src/main/webapp/properties.js ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui ___________________________________________________________________ Added: svn:ignore + target Added: trunk/bow-ui/LICENSE.txt =================================================================== --- trunk/bow-ui/LICENSE.txt (rev 0) +++ trunk/bow-ui/LICENSE.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/bow-ui/LICENSE.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-ui/README.txt =================================================================== --- trunk/bow-ui/README.txt (rev 0) +++ trunk/bow-ui/README.txt 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,7 @@ +Bow : Bookmark on the web +http://www.chorem.org/projects/show/bow + +Installation +============ +- compile with maven +- copy war in jetty or tomcat installation Property changes on: trunk/bow-ui/README.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui/changelog.txt ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml (rev 0) +++ trunk/bow-ui/pom.xml 2011-02-25 16:57:19 UTC (rev 224) @@ -0,0 +1,286 @@ +<?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/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>bow</artifactId> + <version>0.5-SNAPSHOT</version> + </parent> + + <artifactId>bow-ui</artifactId> + + <name>BOW UI</name> + <description>bookmarks on web UI</description> + <inceptionYear>2010</inceptionYear> + + <packaging>war</packaging> + + <properties> + <i18n.bundles>fr_FR,en_GB</i18n.bundles> + <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName> + <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources + </i18n.bundleOutputDir> + <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + </properties> + + <dependencies> + +  + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + +  + + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + +  + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + +  + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-spring-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>compile</scope> + </dependency> + + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> +  + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator + </templates> + <fullPackagePath>org.chorem.bow</fullPackagePath> + <defaultPackage>org.chorem.bow</defaultPackage> + <extractedPackages> + org.chorem.bow,org.nuiton.wikitty + </extractedPackages> + <generatedPackages>org.chorem.bow</generatedPackages> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-generators</artifactId> + <version>${wikittyVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <id>scan-java-sources</id> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + <execution> + <id>scan-jsp-sources</id> + <goals> + <goal>parserJsp</goal> + </goals> + <configuration> + <userRulesFiles> + <file>${basedir}/src/main/i18n/jsp.rules</file> + </userRulesFiles> + <namespaces> + <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> + <sx> + http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd + </sx> + <jsp>http://java.sun.com/JSP/Page</jsp> + <decorator> + http://www.opensymphony.com/sitemesh/decorator + </decorator> + </namespaces> + </configuration> + </execution> + <execution> + <id>gen-and-make-bundle</id> + <goals> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.chorem</groupId> + <artifactId>bow-ext</artifactId> + <version>0.5-SNAPSHOT</version> + <type>crx</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/${project.build.finalName}/extensions/</outputDirectory> + <destFileName>bow4chromium.crx</destFileName> + </artifactItem> + </artifactItems> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Property changes on: trunk/bow-ui/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java =================================================================== --- trunk/src/main/java/org/chorem/bow/BowMigration04To05.java 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java 2011-02-25 16:57:19 UTC (rev 224) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow; Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/BowMigration04To05.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java =================================================================== --- trunk/src/main/java/org/chorem/bow/action/Migrate04To05Action.java 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java 2011-02-25 16:57:19 UTC (rev 224) @@ -1,3 +1,26 @@ +/* + * #%L + * BOW UI + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.bow.action; Property changes on: trunk/bow-ui/src/main/java/org/chorem/bow/action/Migrate04To05Action.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/src/main/webapp/template/simple/a-close.ftl 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl 2011-02-25 16:57:19 UTC (rev 224) @@ -1,6 +1,6 @@ <#-- /* - * $Id: a-close.ftl 753015 2009-03-12 21:00:23Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/bow-ui/src/main/webapp/template/simple/a-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui/src/main/xmi/README ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/bow-ui/src/main/xmi/bow-0.4.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-25 15:12:31 UTC (rev 223) +++ trunk/pom.xml 2011-02-25 16:57:19 UTC (rev 224) @@ -1,5 +1,6 @@ <?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/xsd/maven-4.0.0.xsd"> +<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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -17,12 +18,17 @@ <artifactId>bow</artifactId> <version>0.5-SNAPSHOT</version> + <modules> + <module>bow-extension-chromium</module> + <module>bow-ui</module> + </modules> + <name>bow</name> <description>bookmarks on web</description> <inceptionYear>2010</inceptionYear> <url>http://maven-site.chorem.org/bow</url> - <packaging>war</packaging> + <packaging>pom</packaging> <licenses> <license> @@ -50,162 +56,131 @@ <wikittyVersion>3.0.5-SNAPSHOT</wikittyVersion> <slf4jVersion>1.6.1</slf4jVersion> <struts2Version>2.1.8.1</struts2Version> + <struts2Version>2.1.8.1</struts2Version> + <xWorkCoreVersion>2.1.6</xWorkCoreVersion> + <htmlParserVersion>1.6</htmlParserVersion> + <javaxMailVersion>1.4.3</javaxMailVersion> + <servletApiVersion>2.5</servletApiVersion> + <jspApiVersion>2.0</jspApiVersion> + <h2Version>1.2.134</h2Version> + <crxMavenPluginVersion>1.1.0</crxMavenPluginVersion> - <i18n.bundles>fr_FR,en_GB</i18n.bundles> - <i18n.silent>true</i18n.silent> - <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName> - <i18n.bundleOutputDir>${basedir}/target/generated-sources/resources - </i18n.bundleOutputDir> - <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> -  <license.licenseName>agpl_v3</license.licenseName> </properties> - <dependencies> + <dependencyManagement> + <dependencies> -  +  - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${wikittyVersion}</version> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork-core</artifactId> - <version>2.1.6</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork-core</artifactId> + <version>${xWorkCoreVersion}</version> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>org.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>${htmlParserVersion}</version> + </dependency> -  + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>${javaxMailVersion}</version> + </dependency> - <dependency> - <groupId>org.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.6</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servletApiVersion}</version> + </dependency> - <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - <version>1.4.3</version> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>${jspApiVersion}</version> + </dependency> -  + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc-impl</artifactId> + <version>${wikittyVersion}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr-impl</artifactId> + <version>${wikittyVersion}</version> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + </dependency> -  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc-impl</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-spring-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr-impl</artifactId> - <version>${wikittyVersion}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-config-browser-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4jVersion}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.134</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-spring-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - </dependencies> + </dependencies> + </dependencyManagement> + <build> <resources> <resource> @@ -243,87 +218,23 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <groupId>com.google.code</groupId> + <artifactId>crx-maven-plugin</artifactId> + <version>${crxMavenPluginVersion}</version> + </plugin> + </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api generator</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - <input>classpath:model:/:wikitty.objectmodel</input> - </inputs> -  - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator - </templates> - <fullPackagePath>org.chorem.bow</fullPackagePath> - <defaultPackage>org.chorem.bow</defaultPackage> - <extractedPackages> - org.chorem.bow,org.nuiton.wikitty - </extractedPackages> - <generatedPackages>org.chorem.bow</generatedPackages> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> + </build> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-generators</artifactId> - <version>${wikittyVersion}</version> - </dependency> - </dependencies> - </plugin> + <pluginRepositories> + <pluginRepository> + <name>crx-maven-plugin.googlecode.com</name> + <id>crx-maven-plugin.googlecode.com</id> + <url>http://crx-maven-plugin.googlecode.com/svn-history/maven2/</url> + </pluginRepository> + </pluginRepositories> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <id>scan-java-sources</id> - <goals> - <goal>parserJava</goal> - </goals> - </execution> - <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx> - http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd - </sx> - <jsp>http://java.sun.com/JSP/Page</jsp> - <decorator> - http://www.opensymphony.com/sitemesh/decorator - </decorator> - </namespaces> - </configuration> - </execution> - <execution> - <id>gen-and-make-bundle</id> - <goals> - <goal>gen</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> </project>

1 0

r223 - in trunk/src/main/webapp: WEB-INF/decorators jsp jsp/inc
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 16:12:31 +0100 (Fri, 25 Feb 2011) New Revision: 223 Url: http://chorem.org/repositories/revision/bow/223 Log: Bow is almost W3C compliant again. Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp trunk/src/main/webapp/jsp/error.jsp trunk/src/main/webapp/jsp/inc/bookmark.jsp trunk/src/main/webapp/jsp/search.jsp Modified: trunk/src/main/webapp/WEB-INF/decorators/main.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/WEB-INF/decorators/main.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow Modified: trunk/src/main/webapp/jsp/error.jsp =================================================================== --- trunk/src/main/webapp/jsp/error.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/jsp/error.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -76,7 +76,7 @@ <p class="tags"> <strong><s:text name="bow.bookmark.tags" /> :</strong> <s:iterator value="#request.bookmark.labels"> - <s:url var="deleteTag" action="deleteTag" escapeAmp="false"> + <s:url var="deleteTag" action="deleteTag"> <s:param name="bookmarkId"><s:property value="%{#wikittyId}" /></s:param> <s:param name="deleteTag"><s:property /></s:param> <s:param name="searchLine"><s:property value="%{#searchLine}" /></s:param> @@ -88,7 +88,7 @@ </s:a> </s:if> <s:else> - <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration: none;" href="%{#deleteTag}"> + <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration:none;" href="%{#deleteTag}"> <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> </s:a> </s:else> Modified: trunk/src/main/webapp/jsp/search.jsp =================================================================== --- trunk/src/main/webapp/jsp/search.jsp 2011-02-25 14:59:33 UTC (rev 222) +++ trunk/src/main/webapp/jsp/search.jsp 2011-02-25 15:12:31 UTC (rev 223) @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- #%L bow

1 0

r222 - in trunk/src/main/webapp/jsp: . inc
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 15:59:33 +0100 (Fri, 25 Feb 2011) New Revision: 222 Url: http://chorem.org/repositories/revision/bow/222 Log: The i18n plugin doesn't throw exceptions anymore on build (fixed anomaly #301). Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp trunk/src/main/webapp/jsp/permanentXml.jsp trunk/src/main/webapp/jsp/temporaryXml.jsp Modified: trunk/src/main/webapp/jsp/inc/tagsCloud.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/inc/tagsCloud.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -1,4 +1,3 @@ -<%@page import="org.chorem.bow.BookmarkActions"%>  <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> +<%@page import="org.chorem.bow.BookmarkActions"%> -<s:if test="#request.bookmarkActions != null"> - <div id="nuage" - xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" - xmlns:jsp="http://java.sun.com/JSP/Page"> +<div id="nuage" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> + <s:if test="#request.bookmarkActions != null"> <s:if test="%{#session.BowSession.preference.tags > #request.bookmarkActions.getTagsCloud().size()}"> <s:set var="maxTags" value="#request.bookmarkActions.getTagsCloud().size()" /> </s:if> <s:else> - <s:set var="maxTags" value="#session.BowSession.preference.tags" /> + <s:set var="maxTags" value="#session.BowSession.preference.tags" /> </s:else> <s:iterator value="%{#request.bookmarkActions.tagsCloud}" status="tag" begin="0" end="%{#maxTags - 1}"> <s:url var="search" action="search" escapeAmp="true"> @@ -45,5 +45,5 @@  <s:a href="%{search}" title="%{count} results" cssClass="tag" cssStyle="font-size: %{#request.bookmarkActions.getFont(count)}px"><s:property value="topicName" /></s:a> </s:iterator> - </div> -</s:if> \ No newline at end of file + </s:if> +</div> \ No newline at end of file Modified: trunk/src/main/webapp/jsp/permanentXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/permanentXml.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -1,4 +1,3 @@ -<%@page import="org.chorem.bow.BowConfig"%> <!-- #%L bow @@ -30,12 +29,15 @@ String url = BowConfig.getInstance().getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" - xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + xmlns:moz="http://www.mozilla.org/2006/browser/search/" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> <ShortName>Bow (permanent)</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />&searchLine={searchTerms}" /> + <s:set var="token" value="#session.BowSession.getPermanentToken()" /> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=${token}&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=${token}&searchLine={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription> Modified: trunk/src/main/webapp/jsp/temporaryXml.jsp =================================================================== --- trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 14:23:02 UTC (rev 221) +++ trunk/src/main/webapp/jsp/temporaryXml.jsp 2011-02-25 14:59:33 UTC (rev 222) @@ -29,12 +29,15 @@ String url = BowConfig.getInstance().getBowUrl(); %> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" - xmlns:moz="http://www.mozilla.org/2006/browser/search/"> + xmlns:moz="http://www.mozilla.org/2006/browser/search/" + xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + xmlns:jsp="http://java.sun.com/JSP/Page"> <ShortName>Bow (temporary)</ShortName> <Description>bookmarkSearch</Description> <InputEncoding>inputEncoding</InputEncoding> <Image width="16" height="16" type="image/ico"><%=url%>img/bow.gif</Image> - <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&searchLine={searchTerms}" /> - <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=<s:property value='%{#session.BowSession.getTemporaryToken()}' />&search={searchTerms}" /> + <s:set var="token" value="%{#session.BowSession.getTemporaryToken()}" /> + <Url type="text/html" method="GET" template="<%=url%>openSearchResult.action?token=${token}&searchLine={searchTerms}" /> + <Url type="application/x-suggestions+json" method="GET" template="<%=url%>openSearchSuggestion.action?token=${token}&search={searchTerms}" /> <moz:SearchForm><%=url%></moz:SearchForm> </OpenSearchDescription>

1 0

r221 - trunk/src/main/webapp/jsp/inc
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 15:23:02 +0100 (Fri, 25 Feb 2011) New Revision: 221 Url: http://chorem.org/repositories/revision/bow/221 Log: Fixed the rightMenu.jsp page for i18n plugin. Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp Modified: trunk/src/main/webapp/jsp/inc/rightMenu.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-25 14:11:36 UTC (rev 220) +++ trunk/src/main/webapp/jsp/inc/rightMenu.jsp 2011-02-25 14:23:02 UTC (rev 221) @@ -49,8 +49,10 @@ <li><s:a action="admin"><s:text name="bow.rightMenu.admin" /></s:a></li> </s:if> <li><s:a action="preferences"><s:text name="bow.preferences.title" /></s:a></li> - <li><a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=<s:property value='#session.BowSession.getTemporaryToken()' />&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></a></li> - <li><a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=<s:property value='#session.BowSession.getPermanentToken()' />&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></a></li> + <s:set var="permanentToken" value="#session.BowSession.getPermanentToken()" /> + <s:set var="temporaryToken" value="#session.BowSession.getTemporaryToken()" /> + <li><a title="%{getText('bow.rightMenu.bookmark.temporaryLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${temporaryToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.temporaryLink" /></a></li> + <li><a title="%{getText('bow.rightMenu.bookmark.permanentLinkDescription')}" href="javascript:var%20url=location.href;var%20nameAndTags=prompt('Entrez%20le%20nom%20du%20lien%20et%20la%20liste%20des%20tags%20sous%20la%20forme:%20name|tag1%20tag2%20tag3',%20document.title+'|');if%20(nameAndTags!=(document.title+'|')){var%20link='<%=bowUrl%>addUrl.action?token=${permanentToken}&url='+encodeURIComponent(url)+'&nameAndTags='+encodeURIComponent(nameAndTags);var%20script=document.createElement('script');script.src=link;script.type='text/javascript';document.body.appendChild(script);}void(0);"><s:text name="bow.rightMenu.bookmark.permanentLink" /></a></li> </ul> <div id="extensions"> <h2><s:text name="bow.rightMenu.extensions" /></h2>

1 0

r220 - trunk/src/main/webapp/jsp
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 15:11:36 +0100 (Fri, 25 Feb 2011) New Revision: 220 Url: http://chorem.org/repositories/revision/bow/220 Log: Fixed the preferences.jsp page for i18n plugin. Modified: trunk/src/main/webapp/jsp/preferences.jsp Modified: trunk/src/main/webapp/jsp/preferences.jsp =================================================================== --- trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 14:00:15 UTC (rev 219) +++ trunk/src/main/webapp/jsp/preferences.jsp 2011-02-25 14:11:36 UTC (rev 220) @@ -116,7 +116,8 @@ <s:url var="deleteImport" action="deleteImport"> <s:param name="date"><%=dateSave%></s:param> </s:url> - <a class="deleteImportButton" href="" onclick="deleteConfirmation('<s:property value="%{deleteImport}" />','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a> + <s:set var="deleteImport" value="%{deleteImport}" /> + <a class="deleteImportButton" href="" onclick="deleteConfirmation('${deleteImport}','<%=bookmarkImport.getCount()%>','<%=date%>'); return(false);"></a> </div> <% i++;

1 0

r219 - in trunk/src/main/webapp: jsp/inc template/simple
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 15:00:15 +0100 (Fri, 25 Feb 2011) New Revision: 219 Url: http://chorem.org/repositories/revision/bow/219 Log: Added modified template of "<a>" tag. Fixed the bookmarks.jsp for i18n plugin. Added: trunk/src/main/webapp/template/simple/a-close.ftl Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp Modified: trunk/src/main/webapp/jsp/inc/bookmark.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 13:33:27 UTC (rev 218) +++ trunk/src/main/webapp/jsp/inc/bookmark.jsp 2011-02-25 14:00:15 UTC (rev 219) @@ -88,9 +88,9 @@ </s:a> </s:if> <s:else> - <a name="<s:property value='%{#wikittyId}' />" style="display:none; text-decoration: none;" href="<s:property value='%{#deleteTag}' />"> + <s:a name="%{#wikittyId}" cssStyle="display:none; text-decoration: none;" href="%{#deleteTag}"> <img style="border:none;" src="img/delete.png" alt="Delete tag" title="Delete" /> - </a> + </s:a> </s:else> <s:url var="search" action="search"> <s:param name="searchLine"><s:property /></s:param> Added: trunk/src/main/webapp/template/simple/a-close.ftl =================================================================== --- trunk/src/main/webapp/template/simple/a-close.ftl (rev 0) +++ trunk/src/main/webapp/template/simple/a-close.ftl 2011-02-25 14:00:15 UTC (rev 219) @@ -0,0 +1,48 @@ +<#-- +/* + * $Id: a-close.ftl 753015 2009-03-12 21:00:23Z musachy $ + * + * 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. + */ +--> +<a<#rt/> +<#if parameters.id?if_exists != ""> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.href?if_exists != ""> + href="${parameters.href}"<#rt/> +</#if> +<#if parameters.tabindex??> + tabindex="${parameters.tabindex?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> +</#if> +<#if parameters.title??> + title="${parameters.title?html}"<#rt/> +</#if> +<#if parameters.name??> + name="${parameters.name?html}"<#rt/> +</#if> +<#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> +<#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> +<#include "/${parameters.templateDir}/simple/dynamic-attributes.ftl" /> +>${parameters.body}</a>

1 0

r218 - trunk/src/main/webapp/jsp/inc
by vbriand＠users.chorem.org 25 Feb '11

25 Feb '11

Author: vbriand Date: 2011-02-25 14:33:27 +0100 (Fri, 25 Feb 2011) New Revision: 218 Url: http://chorem.org/repositories/revision/bow/218 Log: Added missing Struts2 tags. The page header can now be parsed properly by the i18n plugin. Modified: trunk/src/main/webapp/jsp/inc/header.jsp Modified: trunk/src/main/webapp/jsp/inc/header.jsp =================================================================== --- trunk/src/main/webapp/jsp/inc/header.jsp 2011-02-25 09:53:59 UTC (rev 217) +++ trunk/src/main/webapp/jsp/inc/header.jsp 2011-02-25 13:33:27 UTC (rev 218) @@ -26,16 +26,19 @@ <div id="header" xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <s:if test="%{#session.BowSession.user != null}"> - <a class="logo" href="home.action?token=<s:property value='%{#session.BowSession.getPermanentToken()}' />">bow</a> - </s:if> - <s:else> - <a class="logo" href="home.action">bow</a> - </s:else> - <span id="actionmessageHeader"> - <s:actionmessage /> - </span> - <span id="actionerrorHeader"> - <s:actionerror /> - </span> + <s:if test="%{#session.BowSession.user != null}"> + <s:url var="homeToken" action="home"> + <s:param name="token"><s:property value="%{#session.BowSession.getPermanentToken()}" /></s:param> + </s:url> + <s:a cssClass="logo" href="%{homeToken}">bow</s:a> + </s:if> + <s:else> + <s:a cssClass="logo" action="home">bow</s:a> + </s:else> + <span id="actionmessageHeader"> + <s:actionmessage /> + </span> + <span id="actionerrorHeader"> + <s:actionerror /> + </span> </div> \ No newline at end of file

1 0