aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1075045 - in /aries/branches/experimental-release-by-module/proxy: ./ proxy-distro/ proxy-distro/src/main/assemblies/ src/ src/main/ src/main/assemblies/
Date Sun, 27 Feb 2011 12:52:52 GMT
Author: zoe
Date: Sun Feb 27 12:52:52 2011
New Revision: 1075045

URL: http://svn.apache.org/viewvc?rev=1075045&view=rev
Log:
test create distro

Added:
    aries/branches/experimental-release-by-module/proxy/proxy-distro/LICENSE
    aries/branches/experimental-release-by-module/proxy/proxy-distro/NOTICE
    aries/branches/experimental-release-by-module/proxy/src/
    aries/branches/experimental-release-by-module/proxy/src/main/
    aries/branches/experimental-release-by-module/proxy/src/main/assemblies/
    aries/branches/experimental-release-by-module/proxy/src/main/assemblies/source.xml
Modified:
    aries/branches/experimental-release-by-module/proxy/pom.xml
    aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml
    aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml

Modified: aries/branches/experimental-release-by-module/proxy/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/pom.xml?rev=1075045&r1=1075044&r2=1075045&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/pom.xml Sun Feb 27 12:52:52 2011
@@ -31,37 +31,69 @@
     <packaging>pom</packaging>
 
     <description>
-      A parent pom for all the proxy modules. 
+      A reactor pom for all the proxy modules. 
     </description>
 
-     <properties>
-        <proxy-api-version>0.3</proxy-api-version>
-     </properties>
-
     <modules>
       <module>proxy-api</module>
       <module>proxy-impl</module>
       <module>proxy-bundle</module>
       <module>proxy-itests</module>
     </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <autoVersionSubmodules>false</autoVersionSubmodules>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <goals>deploy</goals>
-                        <arguments>-Papache-release -DskipTests=true</arguments>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
+    
+    <!-- this is executed as part of the release pricess to assemple the submodule source
-->
+    <profiles>
+      <profile>
+        <id>aries-module-source</id>
+         <build>
+		   <plugins>
+			 <plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2-beta-5</version>
+                <executions>
+                  <execution>
+                   <phase>package</phase>
+                     <goals>
+                      <goal>single</goal>
+                     </goals>
+				    <configuration>
+                     <finalName>${project.artifactId}-module-source</finalName>
+                     <outputDirectory>${project.artifactId}-distro/src/main/resources</outputDirectory>
+				     <descriptors>
+				       <descriptor>src/main/assemblies/source.xml</descriptor>
+					</descriptors>
+				   </configuration>
+                  </execution>
+                </executions>
+			</plugin>
+
+            <!--
+<plugin>
+<artifactId>maven-resources-plugin</artifactId>
+<version>2.4.3</version>
+<executions>
+  <execution>
+     <id>copy-resources</id>
+     <phase>package</phase>
+     <goals>
+        <goal>copy-resources</goal>
+     </goals>
+     <configuration>
+        <outputDirectory>${basedir}/target/extra-resources</outputDirectory>
+     <resources>          
+        <resource>
+            <directory>src/non-packaged-resources</directory>
+            <filtering>true</filtering>
+        </resource>
+     </resources>              
+     </configuration>            
+   </execution>
+</executions>
+</plugin>
+-->
+         </plugins>
+	   </build>
+      </profile>
+    </profiles>
 </project>
 

Added: aries/branches/experimental-release-by-module/proxy/proxy-distro/LICENSE
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/LICENSE?rev=1075045&view=auto
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/LICENSE (added)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/LICENSE Sun Feb 27 12:52:52
2011
@@ -0,0 +1,203 @@
+
+                                 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: aries/branches/experimental-release-by-module/proxy/proxy-distro/NOTICE
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/NOTICE?rev=1075045&view=auto
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/NOTICE (added)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/NOTICE Sun Feb 27 12:52:52
2011
@@ -0,0 +1,8 @@
+
+Apache Aries
+Copyright 2009-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Modified: aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml?rev=1075045&r1=1075044&r2=1075045&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/pom.xml Sun Feb 27 12:52:52
2011
@@ -28,7 +28,7 @@
 	<groupId>org.apache.aries.proxy</groupId>
 	<artifactId>org.apache.aries.proxy-distro</artifactId>
 	<name>Proxy distribution</name>
-    <version>0.8</version>
+    <version>0.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
     <scm>
@@ -38,14 +38,50 @@
     </scm>
 
 
-    <modules>
-        <module>../proxy-api</module>
-        <module>../proxy-impl</module>
-        <module>../proxy-bundle</module> 
-    </modules>
+    <dependencies>
+       <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy.api</artifactId>
+            <version>0.3</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy.impl</artifactId>
+            <version>0.5</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy</artifactId>
+            <version>0.4</version>
+        </dependency>
+       <dependency>
+            <groupId>org.apache.aries.proxy</groupId>
+            <artifactId>org.apache.aries.proxy.itests</artifactId>
+            <version>0.4</version>
+        </dependency>
+    </dependencies>
 
-	<build>
+    <build>
 		<plugins>
+         <plugin>
+           <artifactId>maven-antrun-plugin</artifactId>
+             <executions>
+                <execution>
+                  <phase>package</phase>
+                  <configuration>
+                  <tasks>
+                  <!--
+                     <copy file="src/main/resources/proxy-module-source.zip" tofile="src/main/resources/flibble.zip"/>
+                     -->
+                     <unzip src="src/main/resources/proxy-module-source.zip" dest="src/main/resources/source"
/>
+                  </tasks>
+                  </configuration>
+                  <goals>
+                    <goal>run</goal>
+                  </goals>
+               </execution>
+            </executions>
+      </plugin>
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<version>2.2-beta-5</version>

Modified: aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml?rev=1075045&r1=1075044&r2=1075045&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
(original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-distro/src/main/assemblies/proxy-distro.xml
Sun Feb 27 12:52:52 2011
@@ -25,37 +25,36 @@
 
 	<includeBaseDirectory>false</includeBaseDirectory>
 
+    <dependencySets>
+      <dependencySet>
+      <includes>
+        <include>org.apache.aries.proxy*</include>
+      </includes>
+      <outputDirectory>apache-aries-proxy-${project.version}/bundles</outputDirectory>
+      </dependencySet>
+    </dependencySets>
+
     <!-- These two files are required to get the IANAL checks to pass. Maybe there is
a better way? -->
     <files>
       <file>
-        <source>../NOTICE</source>
+        <source>NOTICE</source>
         <outputDirectory>META-INF</outputDirectory> 
       </file>
       <file>
-        <source>../LICENSE</source>
+        <source>LICENSE</source>
         <outputDirectory>META-INF</outputDirectory> 
       </file>
+      <!--
+      <file>
+        <source>src/main/resources/proxy-module-source.zip</source>
+        <outputDirectory>apache-aries-proxy-${project.version}/source</outputDirectory>

+      </file>
+      -->
     </files>
-
-     <fileSets>
-      <fileSet> 
-        <directory>..</directory>
-        <outputDirectory>apache-aries-proxy-${project.version}</outputDirectory>
-        <excludes>
-          <exclude>**/**target/**</exclude>
-          <exclude>**proxy-distro/**</exclude>
-        </excludes>
-        </fileSet>
+    <fileSets>
+      <fileSet>
+        <directory>src/main/resources/source</directory>
+      <outputDirectory>apache-aries-proxy-${project.version}/</outputDirectory>
+      </fileSet>
      </fileSets>
-      
-    <moduleSets>
-        <moduleSet>
-            <binaries>
-                  <includeDependencies>false</includeDependencies>
-                  <outputDirectory>apache-aries-proxy-${project.version}/bundles</outputDirectory>
-                  <unpack>false</unpack>
-            </binaries>
-        </moduleSet>
-    </moduleSets>
-    
 </assembly>

Added: aries/branches/experimental-release-by-module/proxy/src/main/assemblies/source.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/src/main/assemblies/source.xml?rev=1075045&view=auto
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/src/main/assemblies/source.xml (added)
+++ aries/branches/experimental-release-by-module/proxy/src/main/assemblies/source.xml Sun
Feb 27 12:52:52 2011
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	<!--
+		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.
+	-->
+<assembly
+	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+
+    <!-- These two files are required to get the IANAL checks to pass. Maybe there is
a better way? -->
+    <files>
+      <file>
+        <source>NOTICE</source>
+        <outputDirectory>META-INF</outputDirectory> 
+      </file>
+      <file>
+        <source>LICENSE</source>
+        <outputDirectory>META-INF</outputDirectory> 
+      </file>
+    </files>
+
+     <fileSets>
+      <fileSet> 
+        <outputDirectory></outputDirectory>
+        <excludes>
+          <exclude>**/**target/**</exclude>
+          <exclude>**proxy-distro/**</exclude>
+        </excludes>
+        </fileSet>
+     </fileSets>
+</assembly>



Mime
View raw message