Author: mrdon Date: Thu Jul 27 13:06:40 2006 New Revision: 426221 URL: http://svn.apache.org/viewvc?rev=426221&view=rev Log: Adding an assembly to generate one combined e4x-capable jar
Added: jakarta/commons/sandbox/js2j/trunk/assembly/ jakarta/commons/sandbox/js2j/trunk/assembly/pom.xml jakarta/commons/sandbox/js2j/trunk/assembly/src/ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/assembly/ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/assembly/all.xml jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/LICENSE.txt jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/NOTICE.txt Modified: jakarta/commons/sandbox/js2j/trunk/src/test/java/org/apache/commons/js2j/PropertiesExtensionsTest.java Added: jakarta/commons/sandbox/js2j/trunk/assembly/pom.xml URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/assembly/pom.xml?rev=426221&view=auto ============================================================================== --- jakarta/commons/sandbox/js2j/trunk/assembly/pom.xml (added) +++ jakarta/commons/sandbox/js2j/trunk/assembly/pom.xml Thu Jul 27 13:06:40 2006 @@ -0,0 +1,79 @@ +<?xml version="1.0"?> +<!-- +/* + * Copyright 2005-2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Id: pom.xml 425796 2006-07-26 18:18:44Z mrdon $ + */ +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.commons</groupId> + <artifactId>js2j-assembly</artifactId> + <version>0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>JS2J Assembly</name> + <description> + JS2J Assembly + </description> + + <scm> + <connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/commons/sandbox/js2j/trunk/assembly</connection> + <developerConnection> + scm:svn:https://svn.apache.org/repos/asf/jakarta/commons/sandbox/js2j/trunk/assembly</developerConnection> + <url>http://svn.apache.org/viewcvs.cgi/jakarta/commons/sandbox/js2j/trunk/assembly</url> + </scm> + + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <descriptors> + <descriptor>src/main/assembly/all.xml</descriptor> + <!--<descriptor>src/main/assembly/bin.xml</descriptor>--> + </descriptors> + <finalName>commons-js2j-${version}</finalName> + <outputDirectory>target/assembly/out</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + <archive> + <manifest> + <mainClass>org.apache.commons.js2j.Main</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-js2j</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>xmlbeans</groupId> + <artifactId>xbean</artifactId> + <version>1.0.4</version> + <scope>runtime</scope> + </dependency> + </dependencies> + +</project> Added: jakarta/commons/sandbox/js2j/trunk/assembly/src/main/assembly/all.xml URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/assembly/src/main/assembly/all.xml?rev=426221&view=auto ============================================================================== --- jakarta/commons/sandbox/js2j/trunk/assembly/src/main/assembly/all.xml (added) +++ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/assembly/all.xml Thu Jul 27 13:06:40 2006 @@ -0,0 +1,50 @@ +<!-- +/* + * $Id: all.xml 421815 2006-07-14 06:34:51Z wsmoak $ + * + * Copyright 2006 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> + +<assembly> + <!-- TODO: a jarjar format would be better --> + <id>all</id> + <formats> + <format>jar</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>/MsETA-INF</outputDirectory> + <includes> + <include>MANIFEST.MF</include> + </includes> + </fileSet> + </fileSets> + + <dependencySets> + <dependencySet> + <outputDirectory>/</outputDirectory> + <unpack>true</unpack> + <scope>runtime</scope> + <excludes> + <exclude>junit:junit</exclude> + </excludes> + </dependencySet> + </dependencySets> +</assembly> + + Added: jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/LICENSE.txt URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/LICENSE.txt?rev=426221&view=auto ============================================================================== --- jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/LICENSE.txt (added) +++ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/LICENSE.txt Thu Jul 27 13:06:40 2006 @@ -0,0 +1,174 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. Added: jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/NOTICE.txt URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/NOTICE.txt?rev=426221&view=auto ============================================================================== --- jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/NOTICE.txt (added) +++ jakarta/commons/sandbox/js2j/trunk/assembly/src/main/resources/NOTICE.txt Thu Jul 27 13:06:40 2006 @@ -0,0 +1,3 @@ +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + Modified: jakarta/commons/sandbox/js2j/trunk/src/test/java/org/apache/commons/js2j/PropertiesExtensionsTest.java URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/js2j/trunk/src/test/java/org/apache/commons/js2j/PropertiesExtensionsTest.java?rev=426221&r1=426220&r2=426221&view=diff ============================================================================== --- jakarta/commons/sandbox/js2j/trunk/src/test/java/org/apache/commons/js2j/PropertiesExtensionsTest.java (original) +++ jakarta/commons/sandbox/js2j/trunk/src/test/java/org/apache/commons/js2j/PropertiesExtensionsTest.java Thu Jul 27 13:06:40 2006 @@ -34,6 +34,8 @@ run("props.load(file.toString())"); test("props.getProperty('foo')", "bar"); + + test("new java.util.Properties().load(file).foo", "bar"); } public void testStore() throws Exception { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]