ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1470925 - in /ace/trunk: build/ build/lib/ build/resources/ build/resources/bin/ build/resources/deps/ build/resources/src/ cnf/src/org/apache/ace/bnd/
Date Tue, 23 Apr 2013 12:51:53 GMT
Author: marrs
Date: Tue Apr 23 12:51:53 2013
New Revision: 1470925

URL: http://svn.apache.org/r1470925
Log:
Some changes in the build scripts that create source and binary releases.

Added:
    ace/trunk/build/resources/bin/
    ace/trunk/build/resources/bin/LICENSE
    ace/trunk/build/resources/bin/NOTICE
    ace/trunk/build/resources/deps/
    ace/trunk/build/resources/src/
    ace/trunk/build/resources/src/LICENSE
    ace/trunk/build/resources/src/NOTICE
    ace/trunk/build/resources/src/README
Removed:
    ace/trunk/build/LICENSE
    ace/trunk/build/NOTICE
    ace/trunk/build/README
    ace/trunk/build/bin-LICENSE
    ace/trunk/build/bin-NOTICE
    ace/trunk/build/lib/
    ace/trunk/build/resources/debug.bat
    ace/trunk/build/resources/debug.sh
    ace/trunk/build/resources/platform.properties
    ace/trunk/build/resources/run.bat
    ace/trunk/build/resources/run.sh
Modified:
    ace/trunk/build/bin-build.xml
    ace/trunk/build/src-build.xml
    ace/trunk/cnf/src/org/apache/ace/bnd/LibraryIndexer.java

Modified: ace/trunk/build/bin-build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/build/bin-build.xml?rev=1470925&r1=1470924&r2=1470925&view=diff
==============================================================================
--- ace/trunk/build/bin-build.xml (original)
+++ ace/trunk/build/bin-build.xml Tue Apr 23 12:51:53 2013
@@ -4,16 +4,15 @@
 
 	<property name="version" value="1.0.0" />
 
-	<property name="target.base.dir" value="generated/apache-ace-${version}" />
+	<property name="target.base.dir" value="generated/apache-ace-${version}-bin" />
 	<property name="target.server-allinone.dir" value="${target.base.dir}/server-allinone"
/>
 	<property name="target.server.dir" value="${target.base.dir}/server" />
 	<property name="target.client.dir" value="${target.base.dir}/client" />
 	<property name="target.obr.dir" value="${target.base.dir}/obr" />
 	<property name="target.target.dir" value="${target.base.dir}/target" />
-	<property name="server.zipball" value="generated/apache-ace-${version}.zip" />
-	<property name="server.tarball" value="generated/apache-ace-${version}.tar.gz" />
+	<property name="server.zipball" value="generated/apache-ace-${version}-bin.zip" />
 
-	<target name="package" description="Packages ACE into a binary distribution." depends="init">
+	<target name="package" description="Packages Apache ACE into a binary distribution."
depends="init">
 		<mkdir dir="${target.server.dir}" />
 		<mkdir dir="${target.server-allinone.dir}" />
 		<mkdir dir="${target.client.dir}" />
@@ -57,39 +56,13 @@
 		<bndpackage runfile="../run-obr/obr.bndrun" output="${target.obr.dir}/obr.jar" />
 		<bndpackage runfile="../run-target/target.bndrun" output="${target.target.dir}/target.jar"
/>
 
-		<!-- create one giant TAR.GZ-file with everything in it -->
-		<tar destfile="${server.tarball}" compression="gzip">
-			<tarfileset dir="${target.server.dir}" prefix="ace-devserver">
-				<include name="**"/>
-				<exclude name="*.sh"/>
-			</tarfileset>
-			<tarfileset dir="${target.server.dir}" mode="755" prefix="ace-devserver">
-				<include name="*.sh"/>
-			</tarfileset>
-		</tar>
-
 		<!-- create one giant ZIP-file with everything in it -->
-		<zip destfile="${server.zipball}">
-			<tarfileset dir="${target.server.dir}" prefix="ace-devserver">
-				<include name="**"/>
-				<exclude name="*.sh"/>
-			</tarfileset>
-			<tarfileset dir="${target.server.dir}" prefix="ace-devserver">
-				<include name="*.sh"/>
-			</tarfileset>
+		<zip destfile="${server.zipball}" basedir="resources/bin" includes="NOTICE, LICENSE,
README" />
+		<zip destfile="${server.zipball}" update="true">
+			<tarfileset dir="${target.base.dir}" includes="**" />
 		</zip>
-	</target>
-
-	<target name="package-target">
-		<resources id="target-bundles">
-			<url url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.command/org.apache.felix.gogo.command-0.12.0.jar"
/>
-			<url url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.runtime/org.apache.felix.gogo.runtime-0.10.0.jar"
/>
-			<url url="http://bundles.bndtools.org.s3.amazonaws.com/org.apache.felix.gogo.shell/org.apache.felix.gogo.shell-0.10.0.jar"
/>
-			<file file="../org.apache.ace.managementagent/generated/org.apache.ace.managementagent.jar"
/>
-		</resources>
-
-		<copy todir="${target.target.dir}" flatten="true">
-			<resources refid="target-bundles" />
-		</copy>
+		
+		<!-- and cleanup -->
+		<delete dir="${target.base.dir}" />
 	</target>
 </project>

Added: ace/trunk/build/resources/bin/LICENSE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/bin/LICENSE?rev=1470925&view=auto
==============================================================================
--- ace/trunk/build/resources/bin/LICENSE (added)
+++ ace/trunk/build/resources/bin/LICENSE Tue Apr 23 12:51:53 2013
@@ -0,0 +1,340 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+
+
+=========================================================================
+==  XStream License                                                    ==
+=========================================================================
+
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2009, 2011 XStream Committers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of
+conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other materials provided
+with the distribution.
+
+3. Neither the name of XStream nor the names of its contributors may be used to endorse
+or promote products derived from this software without specific prior written
+permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
+WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+
+=========================================================================
+==  XPP3 License                                                       ==
+=========================================================================
+
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, 
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself, 
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
+must not be used to endorse or promote products derived from this 
+software without prior written permission. For written permission, 
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy" 
+name nor may "Indiana Univeristy" appear in their name, without prior 
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+=========================================================================
+==  KXML License                                                       ==
+=========================================================================
+
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+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.
+
+
+=========================================================================
+==  SLF4J License                                                      ==
+=========================================================================
+
+Copyright (c) 2004-2008 QOS.ch
+All rights reserved.
+
+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.

Added: ace/trunk/build/resources/bin/NOTICE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/bin/NOTICE?rev=1470925&view=auto
==============================================================================
--- ace/trunk/build/resources/bin/NOTICE (added)
+++ ace/trunk/build/resources/bin/NOTICE Tue Apr 23 12:51:53 2013
@@ -0,0 +1,95 @@
+Apache ACE
+Copyright 2011-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed at The OSGi 
+Alliance (http://www.osgi.org/).
+Copyright: (c) OSGi Alliance (2000, 2010)
+License: Apache Licence 2.0
+
+This product includes software developed at OPS4J 
+(http://www.ops4j.org/).
+License: Apache License 2.0
+
+This product includes software developed at
+'XStream' (http://xstream.codehaus.org)
+Copyright (c) 2003-2006, Joe Walnes
+Copyright (c) 2006-2007, XStream Committers
+License: BSD-style
+
+This product includes software developed at
+'Extreme! Lab, Indiana University' 
+(http://www.extreme.indiana.edu/)
+Copyright (c) all rights reserved
+License: Apache Software License 1.1
+
+This product includes software developed at
+'Stefan Haustein, Oberhausen, Rhld., Germany' 
+(http://kxml.sourceforge.net/)
+License: BSD-style
+
+This product includes software developed at 
+Vaadin (http://vaadin.com)
+Copyright (c) 2011 Vaadin Ltd.
+License: Apache License 2.0
+
+This product includes software developed at
+Google Inc. (http://www.google.com/)
+Copyright 2008-2011 Google Inc.
+License: Apache License 2.0
+
+This product includes software developed at
+Oracle (http://www.oracle.com/)
+Copyright (c) 2010 Oracle and/or its affiliates.
+License: CDDL
+
+This product includes software developed at
+JCraft (http://www.jcraft.com/).
+Copyright (c) 2002-2010 Atsuhiko Yamanaka, JCraft,Inc. 
+License: BSD-style
+
+This product includes software developed at
+'GSON' (https://code.google.com/p/google-gson/).
+License: Apache License 2.0
+
+This product includes software developed at
+'SLF4J' (https://slf4j.org/).
+License: MIT
+
+
+=========================================================================
+==  Apache Ant Notice (v1.8.4)                                         ==
+=========================================================================
+
+   Apache Ant
+   Copyright 1999-2012 The Apache Software Foundation
+
+   The <sync> task is based on code Copyright (c) 2002, Landmark
+   Graphics Corp that has been kindly donated to the Apache Software
+   Foundation.
+
+
+=========================================================================
+==  Apache Commons Codec (v1.4)                                        ==
+=========================================================================
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains 
+test data from http://aspell.sourceforge.net/test/batch0.tab.
+
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying
+and distribution of this entire article is permitted in any medium,
+provided this notice is preserved.
+
+
+=========================================================================
+==  Apache Commons Logging (v1.1.1)                                    ==
+=========================================================================
+
+
+This product includes/uses software(s) developed by 'an unknown organization'
+  - Unnamed - avalon-framework:avalon-framework:jar:4.1.3
+  - Unnamed - log4j:log4j:jar:1.2.12
+  - Unnamed - logkit:logkit:jar:1.0.1
+

Added: ace/trunk/build/resources/src/LICENSE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/src/LICENSE?rev=1470925&view=auto
==============================================================================
--- ace/trunk/build/resources/src/LICENSE (added)
+++ ace/trunk/build/resources/src/LICENSE Tue Apr 23 12:51:53 2013
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

Added: ace/trunk/build/resources/src/NOTICE
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/src/NOTICE?rev=1470925&view=auto
==============================================================================
--- ace/trunk/build/resources/src/NOTICE (added)
+++ ace/trunk/build/resources/src/NOTICE Tue Apr 23 12:51:53 2013
@@ -0,0 +1,10 @@
+Apache ACE
+Copyright 2011-2013 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software developed at The OSGi 
+Alliance (http://www.osgi.org/).
+Copyright: (c) OSGi Alliance (2000, 2010)
+License: Apache Licence 2.0

Added: ace/trunk/build/resources/src/README
URL: http://svn.apache.org/viewvc/ace/trunk/build/resources/src/README?rev=1470925&view=auto
==============================================================================
--- ace/trunk/build/resources/src/README (added)
+++ ace/trunk/build/resources/src/README Tue Apr 23 12:51:53 2013
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+Welcome to Apache ACE
+=====================
+
+Apache ACE is a software distribution framework that allows you to centrally
+manage and distribute software components, configuration data and other
+artifacts to target systems. It is built using OSGi and can be deployed in
+different topologies. The target systems are usually also OSGi based, but
+don't have to be.
+
+
+Building Apache ACE
+===================
+
+Initial Setup
+--------------
+
+There are two ways of building and developing ACE: on the command line and
+within Eclipse. Below are the requirements in case you want to be able to do
+both:
+
+1)  Install J2SE 6 SDK (or later), which can be downloaded from
+    http://www.oracle.com/technetwork/java/javase/downloads/index.html
+
+2)  Make sure that your JAVA_HOME environment variable is set to the newly
+    installed JDK location, and that your PATH includes
+    %JAVA_HOME%\bin (windows) or $JAVA_HOME/bin (unix).
+
+3)  Install Apache Ant 1.8 (or later), which can be downloaded from:
+    http://ant.apache.org/bindownload.cgi
+    
+4)  Install Eclipse, for example, Eclipse Juno with the following plugins:
+    * Subclipse;
+    * BndTools;
+    * TestNG.
+
+Building
+--------
+
+From the command line:
+
+1)  Go into the build directory and invoke Ant:
+    $ ant
+
+2)  To generate a binary package, you can optionally invoke:
+    $ ant -f bin-build.xml package
+
+Within Eclipse:
+
+From the main menu in Eclipse, choose: "File -> Import..." and then
+select "General -> Existing projects into workspace..." and select
+your workspace folder. A list of projects should show up now. Import
+them all, wait until Eclipse has built the project and you're ready
+to start.
+
+The latest instructions can always be found on our website:
+
+http://ace.apache.org/dev-doc/getting-started.html
+
+
+Getting Started
+===============
+
+To start using Apache ACE, please go to our website and read the
+getting started guide for users:
+
+http://ace.apache.org/user-doc/getting-started.html
+
+Many thanks for using Apache ACE.
+
+The ACE Team

Modified: ace/trunk/build/src-build.xml
URL: http://svn.apache.org/viewvc/ace/trunk/build/src-build.xml?rev=1470925&r1=1470924&r2=1470925&view=diff
==============================================================================
--- ace/trunk/build/src-build.xml (original)
+++ ace/trunk/build/src-build.xml Tue Apr 23 12:51:53 2013
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="src-build" default="package-src">
-	<property name="version" value="0.0.0.CHANGEME" />
-	<property name="target.base.dir" value="generated/ace-sources-${version}" />
-	<property name="src.zip" value="${target.base.dir}/ace-sources-${version}.zip" />
+	<property name="version" value="1.0.0" />
+	<property name="src.zip" value="generated/apache-ace-${version}-src.zip" />
+	<property name="deps.zip" value="generated/apache-ace-${version}-deps.zip" />
 	<property name="src.asc" value="${src.zip}.asc" />
 	<property name="src.md5" value="${src.zip}.md5" />
 	<property name="src.sha" value="${src.zip}.sha" />
 	<property name="svn.staging.path" value="https://dist.apache.org/repos/dist/dev/ace"
/>
 	<property name="svn.release.path" value="https://dist.apache.org/repos/dist/release/ace"
/>
 
-	<target name="clean">
-		<delete dir="${target.base.dir}" />
-	</target>
-
 	<target name="package-src">
-		<mkdir dir="${target.base.dir}" />
-		<zip destfile="${src.zip}" basedir=".." includes="
+		<zip destfile="${src.zip}" basedir="resources/src" includes="NOTICE, LICENSE, README"
/>
+		<zip destfile="${src.zip}" basedir=".." update="true" includes="
 			*/.project,
 			*/.classpath,
 			*/.settings/**,
@@ -24,11 +20,16 @@
 			*/resources/**,
 			*/*.bnd,
 			*/*.bndrun,
-			*/build.xml,
-			run-server/conf/**,
-			cnf/ext/**,
-			cnf/repo/repository.xml,
-			NOTICE, LICENSE, README
+			*/*build*.xml,
+			run-*/conf/**,
+			cnf/ext/**
+			" />
+		<zip destfile="${src.zip}" basedir="resources/deps" includes="NOTICE, LICENSE, README"
/>
+		<zip destfile="${deps.zip}" basedir=".." update="true" includes="
+			cnf/buildrepo/**,
+			cnf/localrepo/**,
+			cnf/lib/**,
+			cnf/plugins/**,
 			">
 		</zip>
 	</target>

Modified: ace/trunk/cnf/src/org/apache/ace/bnd/LibraryIndexer.java
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/src/org/apache/ace/bnd/LibraryIndexer.java?rev=1470925&r1=1470924&r2=1470925&view=diff
==============================================================================
--- ace/trunk/cnf/src/org/apache/ace/bnd/LibraryIndexer.java (original)
+++ ace/trunk/cnf/src/org/apache/ace/bnd/LibraryIndexer.java Tue Apr 23 12:51:53 2013
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.ace.bnd;
 
 import java.io.File;



Mime
View raw message