- Nuiton-js-commits - mailman.cloud.codelutin.com

r319 - in nuiton-js-jsplumb/trunk: . src src/license src/main/resources/META-INF/nuiton-js src/site
by echatellier＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: echatellier Date: 2013-12-20 15:17:49 +0100 (Fri, 20 Dec 2013) New Revision: 319 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/319 Log: Update to 1.5.5 Added: nuiton-js-jsplumb/trunk/src/license/ nuiton-js-jsplumb/trunk/src/license/THIRD-PARTY.properties Modified: nuiton-js-jsplumb/trunk/LICENSE.txt nuiton-js-jsplumb/trunk/pom.xml nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml nuiton-js-jsplumb/trunk/src/site/site_en.xml Modified: nuiton-js-jsplumb/trunk/LICENSE.txt =================================================================== --- nuiton-js-jsplumb/trunk/LICENSE.txt 2013-12-20 14:17:01 UTC (rev 318) +++ nuiton-js-jsplumb/trunk/LICENSE.txt 2013-12-20 14:17:49 UTC (rev 319) @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. Modified: nuiton-js-jsplumb/trunk/pom.xml =================================================================== --- nuiton-js-jsplumb/trunk/pom.xml 2013-12-20 14:17:01 UTC (rev 318) +++ nuiton-js-jsplumb/trunk/pom.xml 2013-12-20 14:17:49 UTC (rev 319) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-js-jsplumb</artifactId> - <version>1.5.4-1-SNAPSHOT</version> + <version>1.5.5-1-SNAPSHOT</version> <name>Nuiton JS :: jsPlumb</name> <description>jsPlumb jar packaging</description> @@ -29,7 +29,9 @@ </licenses> <properties> - <upstreamVersion>1.5.4</upstreamVersion> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>1.5.5</upstreamVersion> <upstreamUrl>https://raw.github.com/sporritt/jsPlumb/${upstreamVersion}/dist/js/</upstreamUrl> <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> </properties> Added: nuiton-js-jsplumb/trunk/src/license/THIRD-PARTY.properties =================================================================== --- nuiton-js-jsplumb/trunk/src/license/THIRD-PARTY.properties (rev 0) +++ nuiton-js-jsplumb/trunk/src/license/THIRD-PARTY.properties 2013-12-20 14:17:49 UTC (rev 319) @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Dec 20 15:15:04 CET 2013 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Property changes on: nuiton-js-jsplumb/trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml =================================================================== --- nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml 2013-12-20 14:17:01 UTC (rev 318) +++ nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml 2013-12-20 14:17:49 UTC (rev 319) @@ -6,19 +6,23 @@ %% Copyright (C) 2013 CodeLutin, Chatellier Eric %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: - 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 Lesser Public License for more details. + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. #L% --> <groups xmlns="http://www.isdc.ro/wro"> Modified: nuiton-js-jsplumb/trunk/src/site/site_en.xml =================================================================== --- nuiton-js-jsplumb/trunk/src/site/site_en.xml 2013-12-20 14:17:01 UTC (rev 318) +++ nuiton-js-jsplumb/trunk/src/site/site_en.xml 2013-12-20 14:17:49 UTC (rev 319) @@ -6,19 +6,23 @@ %% Copyright (C) 2013 CodeLutin %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: - 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 Lesser Public License for more details. + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. #L% --> <project name="${project.name}">

1 0

r318 - in nuiton-js-angularjs/trunk/src: . license
by echatellier＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: echatellier Date: 2013-12-20 15:17:01 +0100 (Fri, 20 Dec 2013) New Revision: 318 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/318 Log: Update to 1.2.5 Added: nuiton-js-angularjs/trunk/src/license/ nuiton-js-angularjs/trunk/src/license/THIRD-PARTY.properties Added: nuiton-js-angularjs/trunk/src/license/THIRD-PARTY.properties =================================================================== --- nuiton-js-angularjs/trunk/src/license/THIRD-PARTY.properties (rev 0) +++ nuiton-js-angularjs/trunk/src/license/THIRD-PARTY.properties 2013-12-20 14:17:01 UTC (rev 318) @@ -0,0 +1,20 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Dec 20 15:04:42 CET 2013 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Property changes on: nuiton-js-angularjs/trunk/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r317 - in nuiton-js-angularjs/trunk: . src/main/resources/META-INF/nuiton-js src/site
by echatellier＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: echatellier Date: 2013-12-20 15:16:46 +0100 (Fri, 20 Dec 2013) New Revision: 317 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/317 Log: Update to 1.2.5 Modified: nuiton-js-angularjs/trunk/LICENSE.txt nuiton-js-angularjs/trunk/README.txt nuiton-js-angularjs/trunk/pom.xml nuiton-js-angularjs/trunk/src/main/resources/META-INF/nuiton-js/wro-angularjs.xml nuiton-js-angularjs/trunk/src/site/site_en.xml Modified: nuiton-js-angularjs/trunk/LICENSE.txt =================================================================== --- nuiton-js-angularjs/trunk/LICENSE.txt 2013-12-20 14:10:44 UTC (rev 316) +++ nuiton-js-angularjs/trunk/LICENSE.txt 2013-12-20 14:16:46 UTC (rev 317) @@ -1,166 +1,17 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: - 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. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser 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 -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. Modified: nuiton-js-angularjs/trunk/README.txt =================================================================== --- nuiton-js-angularjs/trunk/README.txt 2013-12-20 14:10:44 UTC (rev 316) +++ nuiton-js-angularjs/trunk/README.txt 2013-12-20 14:16:46 UTC (rev 317) @@ -1,2 +0,0 @@ - -for f in src/main/resources/META-INF/resources/nuiton-js-angularjs/i18n/*.js; do sed -i '1i/* %%Ignore-License */' $f; done Modified: nuiton-js-angularjs/trunk/pom.xml =================================================================== --- nuiton-js-angularjs/trunk/pom.xml 2013-12-20 14:10:44 UTC (rev 316) +++ nuiton-js-angularjs/trunk/pom.xml 2013-12-20 14:16:46 UTC (rev 317) @@ -14,7 +14,7 @@ </parent> <artifactId>nuiton-js-angularjs</artifactId> - <version>1.2.2-1-SNAPSHOT</version> + <version>1.2.5-1-SNAPSHOT</version> <name>Nuiton JS :: AngularJS</name> <description>AngularJS jar packaging</description> @@ -29,7 +29,9 @@ </licenses> <properties> - <upstreamVersion>1.2.2</upstreamVersion> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>1.2.5</upstreamVersion> <upstreamUrl>http://code.angularjs.org/${upstreamVersion}</upstreamUrl> <upstreamFile>angular-${upstreamVersion}.zip</upstreamFile> <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> Modified: nuiton-js-angularjs/trunk/src/main/resources/META-INF/nuiton-js/wro-angularjs.xml =================================================================== --- nuiton-js-angularjs/trunk/src/main/resources/META-INF/nuiton-js/wro-angularjs.xml 2013-12-20 14:10:44 UTC (rev 316) +++ nuiton-js-angularjs/trunk/src/main/resources/META-INF/nuiton-js/wro-angularjs.xml 2013-12-20 14:16:46 UTC (rev 317) @@ -6,19 +6,23 @@ %% Copyright (C) 2013 CodeLutin, Chatellier Eric %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: - 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 Lesser Public License for more details. + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. #L% --> <groups xmlns="http://www.isdc.ro/wro"> Modified: nuiton-js-angularjs/trunk/src/site/site_en.xml =================================================================== --- nuiton-js-angularjs/trunk/src/site/site_en.xml 2013-12-20 14:10:44 UTC (rev 316) +++ nuiton-js-angularjs/trunk/src/site/site_en.xml 2013-12-20 14:16:46 UTC (rev 317) @@ -1,24 +1,28 @@  <project name="${project.name}">

1 0

r316 - in trunk: nuiton-js-test nuiton-js-test/src/license nuiton-js-test/src/main/java/org/nuiton/js/wro nuiton-js-wro/src/license
by echatellier＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: echatellier Date: 2013-12-20 15:10:44 +0100 (Fri, 20 Dec 2013) New Revision: 316 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/316 Log: Fix dependencies and licenses Modified: trunk/nuiton-js-test/pom.xml trunk/nuiton-js-test/src/license/THIRD-PARTY.properties trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-js-test/pom.xml =================================================================== --- trunk/nuiton-js-test/pom.xml 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-test/pom.xml 2013-12-20 14:10:44 UTC (rev 316) @@ -25,6 +25,11 @@ <artifactId>nuiton-js-wro</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -39,6 +44,11 @@ </dependency> <dependency> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-core</artifactId> + </dependency> + + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>compile</scope> Modified: trunk/nuiton-js-test/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-js-test/src/license/THIRD-PARTY.properties 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-test/src/license/THIRD-PARTY.properties 2013-12-20 14:10:44 UTC (rev 316) @@ -1,40 +1,25 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Academic Free License v2.1 # - Apache License version 2.0 -# - Apache v2.0 # - BSD License -# - BSD licence # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License - v 1.0 # - Common Public License Version 1.0 -# - Copyright (C) 2011 by Yehuda Katz -# - Copyright (c) 2002 Douglas Crockford -# - Copyright (c) 2012 Yehuda Katz, Tom Dale, Charles Jolley and Ember.js contributors -# - Copyright 2012 Anton Kovalyov -# - Eclipse Public License, Version 1.0 -# - GNU General Public License Version 2 -# - GNU Lesser General Public License Version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License -# - New BSD license -# - None -# - Public Domain # - The Apache Software License, Version 2.0 # - The MIT License -# - provided without support or warranty #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jul 05 19:02:24 CEST 2013 +#Fri Dec 20 15:02:19 CET 2013 args4j--args4j--2.0.16=MIT License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.antlr--antlr--3.4=BSD License org.antlr--antlr-runtime--3.4=BSD License org.apache.ant--ant--1.8.1=Apache License version 2.0 org.apache.ant--ant-launcher--1.8.1=Apache License version 2.0 Modified: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java =================================================================== --- trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java 2013-12-20 14:10:44 UTC (rev 316) @@ -1,5 +1,29 @@ package org.nuiton.js.wro; +/* + * #%L + * Nuiton JS :: Test + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import ro.isdc.wro.model.factory.WroModelFactory; /** Modified: trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties 2013-12-20 14:10:44 UTC (rev 316) @@ -2,10 +2,10 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Academic Free License v2.1 +# - Apache License Version 2.0 # - Apache License version 2.0 # - Apache v2.0 # - BSD License -# - BSD licence # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License - v 1.0 @@ -14,16 +14,22 @@ # - Copyright (c) 2002 Douglas Crockford # - Copyright (c) 2012 Yehuda Katz, Tom Dale, Charles Jolley and Ember.js contributors # - Copyright 2012 Anton Kovalyov +# - EPL +# - Eclipse Public License (EPL) # - Eclipse Public License, Version 1.0 # - GNU General Public License Version 2 # - GNU Lesser General Public License Version 2.1 +# - GPL 3 +# - Gnu General Public License, Version 3 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 3 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - New BSD license # - None # - Public Domain +# - Revised BSD # - The Apache Software License, Version 2.0 # - The MIT License # - provided without support or warranty @@ -31,12 +37,12 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jul 05 19:02:24 CEST 2013 +#Fri Dec 20 14:59:02 CET 2013 args4j--args4j--2.0.16=MIT License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.antlr--antlr--3.4=BSD License org.antlr--antlr-runtime--3.4=BSD License org.apache.ant--ant--1.8.1=Apache License version 2.0 org.apache.ant--ant-launcher--1.8.1=Apache License version 2.0 org.codehaus.groovy--groovy-all--1.7.4=Apache License version 2.0 +org.jruby--yecht--1.0=Yecht / LICENSE ro.isdc.wro4j--rhino--1.7R5-20130223-1=Apache License version 2.0

1 0

r315 - trunk
by echatellier＠users.nuiton.org 20 Dec '13

20 Dec '13

Author: echatellier Date: 2013-12-20 14:53:51 +0100 (Fri, 20 Dec 2013) New Revision: 315 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/315 Log: Update parent pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-24 17:47:42 UTC (rev 314) +++ trunk/pom.xml 2013-12-20 13:53:51 UTC (rev 315) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.0</version> + <version>4.4</version> </parent> <groupId>org.nuiton.js</groupId>

1 0

r314 - in nuiton-js-jsplumb/trunk: . src/main/resources src/main/resources/META-INF/nuiton-js
by echatellier＠users.nuiton.org 24 Nov '13

24 Nov '13

Author: echatellier Date: 2013-11-24 18:47:42 +0100 (Sun, 24 Nov 2013) New Revision: 314 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/314 Log: Update jsplumb to 1.5.4 Removed: nuiton-js-jsplumb/trunk/src/main/resources/nuiton-js-jsplumb/ Modified: nuiton-js-jsplumb/trunk/pom.xml nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml Modified: nuiton-js-jsplumb/trunk/pom.xml =================================================================== --- nuiton-js-jsplumb/trunk/pom.xml 2013-11-23 20:20:35 UTC (rev 313) +++ nuiton-js-jsplumb/trunk/pom.xml 2013-11-24 17:47:42 UTC (rev 314) @@ -10,11 +10,11 @@ <parent> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-lib</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>nuiton-js-jsplumb</artifactId> - <version>1.5.3-1</version> + <version>1.5.4-1-SNAPSHOT</version> <name>Nuiton JS :: jsPlumb</name> <description>jsPlumb jar packaging</description> @@ -28,10 +28,71 @@ </license> </licenses> + <properties> + <upstreamVersion>1.5.4</upstreamVersion> + <upstreamUrl>https://raw.github.com/sporritt/jsPlumb/${upstreamVersion}/dist/js/</upstreamUrl> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jsplumb-1.5.3-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jsplumb-1.5.3-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-jsplumb-…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/nuiton-js-jsplumb/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/nuiton-js-jsplumb/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-js/nuiton-js-jsplumb/trunk</url> </scm> + <dependencies> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-test</artifactId> + <version>1.0.2-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>url1-download</id> + <phase>process-resources</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>${upstreamUrl}</url> + <toDir>${destDir}</toDir> + <fromFile>jquery.jsPlumb-${upstreamVersion}.js</fromFile> + </configuration> + </execution> + <execution> + <id>url2-download</id> + <phase>process-resources</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>${upstreamUrl}</url> + <toDir>${destDir}</toDir> + <fromFile>mootools.jsPlumb-${upstreamVersion}.js</fromFile> + </configuration> + </execution> + <execution> + <id>url3-download</id> + <phase>process-resources</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>${upstreamUrl}</url> + <toDir>${destDir}</toDir> + <fromFile>yui.jsPlumb-${upstreamVersion}.js</fromFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml =================================================================== --- nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml 2013-11-23 20:20:35 UTC (rev 313) +++ nuiton-js-jsplumb/trunk/src/main/resources/META-INF/nuiton-js/wro-jsplumb.xml 2013-11-24 17:47:42 UTC (rev 314) @@ -23,12 +23,12 @@ --> <groups xmlns="http://www.isdc.ro/wro"> <group name='jsplumb-jquery'> - <js>classpath:nuiton-js-jsplumb/jquery.jsPlumb-1.5.3.js</js> + <js>classpath:META-INF/resources/nuiton-js-jsplumb/jquery.jsPlumb-*.js</js> </group> <group name='jsplumb-mootools'> - <js>classpath:nuiton-js-jsplumb/mootools.jsPlumb-1.5.3.js</js> + <js>classpath:META-INF/resources/nuiton-js-jsplumb/mootools.jsPlumb-*.js</js> </group> <group name='jsplumb-yui'> - <js>classpath:nuiton-js-jsplumb/yui.jsPlumb-1.5.3.js</js> + <js>classpath:META-INF/resources/nuiton-js-jsplumb/yui.jsPlumb-*.js</js> </group> </groups>

1 0

r313 - /
by echatellier＠users.nuiton.org 23 Nov '13

23 Nov '13

Author: echatellier Date: 2013-11-23 21:20:35 +0100 (Sat, 23 Nov 2013) New Revision: 313 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/313 Log: Remove duplicated jquery package Removed: nuiton-js-jquery2/

1 0

r312 - in nuiton-js-jquery/trunk: . src/main/resources
by echatellier＠users.nuiton.org 23 Nov '13

23 Nov '13

Author: echatellier Date: 2013-11-23 21:19:27 +0100 (Sat, 23 Nov 2013) New Revision: 312 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/312 Log: Update version to 1.11.0-beta2 Removed: nuiton-js-jquery/trunk/src/main/resources/nuiton-js-jquery/ Modified: nuiton-js-jquery/trunk/pom.xml Modified: nuiton-js-jquery/trunk/pom.xml =================================================================== --- nuiton-js-jquery/trunk/pom.xml 2013-11-23 20:18:03 UTC (rev 311) +++ nuiton-js-jquery/trunk/pom.xml 2013-11-23 20:19:27 UTC (rev 312) @@ -10,11 +10,11 @@ <parent> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-lib</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>nuiton-js-jquery</artifactId> - <version>1.10.2-2-SNAPSHOT</version> + <version>1.11.0-beta2-1-SNAPSHOT</version> <name>Nuiton JS :: JQuery</name> <description>JQuery jar packaging</description> @@ -29,9 +29,63 @@ </licenses> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jquery-1.10.2-2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-jquery-1.10.2-2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-jquery-1…</url> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/nuiton-js-jquery/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/nuiton-js-jquery/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-js/nuiton-js-jquery/trunk</url> </scm> + <properties> + <upstreamVersion>1.11.0-beta2</upstreamVersion> + <upstreamUrl>http://code.jquery.com/</upstreamUrl> + <upstreamFile>jquery-${upstreamVersion}.js</upstreamFile> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + + <dependencies> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-test</artifactId> + <version>1.0.2-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>${upstreamUrl}</url> + <fromFile>${upstreamFile}</fromFile> + <toFile>${project.build.directory}/${upstreamFile}</toFile> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo message="moving resources" /> + <copy todir="${destDir}" file="${project.build.directory}/${upstreamFile}" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project>

1 0

r311 - nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js
by echatellier＠users.nuiton.org 23 Nov '13

23 Nov '13

Author: echatellier Date: 2013-11-23 21:18:03 +0100 (Sat, 23 Nov 2013) New Revision: 311 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/311 Log: Import angularjs groups Modified: nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml Modified: nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml =================================================================== --- nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml 2013-11-23 20:17:17 UTC (rev 310) +++ nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml 2013-11-23 20:18:03 UTC (rev 311) @@ -22,6 +22,9 @@ #L% --> <groups xmlns="http://www.isdc.ro/wro"> + + <import>classpath:META-INF/nuiton-js/wro-angularjs.xml</import> + <group name='angular-ui-event'> <group-ref>angular</group-ref> <js>classpath:META-INF/resources/nuiton-js-angular-ui-utils/modules/event/event.js</js>

1 0

r310 - in trunk/nuiton-js-test: . src/main/java/org/nuiton/js/wro
by echatellier＠users.nuiton.org 23 Nov '13

23 Nov '13

Author: echatellier Date: 2013-11-23 21:17:17 +0100 (Sat, 23 Nov 2013) New Revision: 310 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/310 Log: fixes #2927: Add new test module to test each packaged library Added: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestModelFactory.java Modified: trunk/nuiton-js-test/pom.xml trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsLibTest.java Modified: trunk/nuiton-js-test/pom.xml =================================================================== --- trunk/nuiton-js-test/pom.xml 2013-11-23 20:16:43 UTC (rev 309) +++ trunk/nuiton-js-test/pom.xml 2013-11-23 20:17:17 UTC (rev 310) @@ -41,7 +41,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <scope>runtime</scope> + <scope>compile</scope> </dependency> <dependency> Modified: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsLibTest.java =================================================================== --- trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsLibTest.java 2013-11-23 20:16:43 UTC (rev 309) +++ trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsLibTest.java 2013-11-23 20:17:17 UTC (rev 310) @@ -1,3 +1,26 @@ +/* + * #%L + * Nuiton JS :: WRO + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.js.wro; import java.io.IOException; @@ -29,24 +52,27 @@ private static final Logger LOG = LoggerFactory.getLogger(NuitonJsLibTest.class); + /** + * Load all available resources (wro-*.xml) file from classpath and try to parse model + * to detect errors. + * + * @throws IOException + */ @Test public void testModelLoad() throws IOException { // get configuration NuitonJsWroConfigurationFactory configFactory = new NuitonJsWroConfigurationFactory(); WroConfiguration wroConfig = configFactory.create(); - + // get test context - final HttpServletRequest request = Mockito.mock(HttpServletRequest.class); - final HttpServletResponse response = Mockito.mock(HttpServletResponse.class); + HttpServletRequest request = Mockito.mock(HttpServletRequest.class); + HttpServletResponse response = Mockito.mock(HttpServletResponse.class); Mockito.when(response.getOutputStream()).thenReturn(new DelegatingServletOutputStream(new NullOutputStream())); - //final WroConfiguration config = Context.get().getConfig(); - Context.set(Context.webContext(request, response, Mockito.mock(FilterConfig.class)), wroConfig); + FilterConfig filterConfig = Mockito.mock(FilterConfig.class); + Context.set(Context.webContext(request, response, filterConfig), wroConfig); // init manager factory - NuitonJsWroManagerFactory managerFactory = new NuitonJsWroManagerFactory(); - //WroManager manager = managerFactory.create(); - //manager.process(); - + NuitonJsWroManagerFactory managerFactory = new NuitonJsTestManagerFactory(); InjectorBuilder builder = new InjectorBuilder(managerFactory); Injector injector = builder.build(); WroModelFactory modelFactory = managerFactory.newModelFactory(); @@ -55,7 +81,6 @@ // parse model WroModel model = modelFactory.create(); Assert.assertTrue("Can't find any valid wro groups !", model.getGroups().size() >= 1); - LOG.info("Successfully parsed {} groups", model.getGroups().size()); GroupsProcessor groupProcessor = new GroupsProcessor(); Added: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java =================================================================== --- trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java (rev 0) +++ trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java 2013-11-23 20:17:17 UTC (rev 310) @@ -0,0 +1,17 @@ +package org.nuiton.js.wro; + +import ro.isdc.wro.model.factory.WroModelFactory; + +/** + * Manager factory used to create test model factory instance. + * + * @author Eric Chatellier + */ +public class NuitonJsTestManagerFactory extends NuitonJsWroManagerFactory { + + @Override + protected WroModelFactory newModelFactory() { + return new NuitonJsTestModelFactory(); + } + +} Property changes on: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestModelFactory.java =================================================================== --- trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestModelFactory.java (rev 0) +++ trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestModelFactory.java 2013-11-23 20:17:17 UTC (rev 310) @@ -0,0 +1,45 @@ +/* + * #%L + * Nuiton JS :: WRO + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.js.wro; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; + +/** + * Model factory used to manage "non servlet context mode" and reduce, log error. + * + * @author Eric Chatellier + */ +public class NuitonJsTestModelFactory extends NuitonJsXmlModelFactory { + + @Override + protected InputStream getModelResourceAsStream() throws IOException { + // just return empty file + return new ByteArrayInputStream("<groups xmlns=\"http://www.isdc.ro/wro\" />".getBytes(Charset.forName("utf-8"))); + } + +} Property changes on: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestModelFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0