aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject svn commit: r1074519 - in /aries/branches/experimental-release-by-module/proxy: proxy-api/pom.xml proxy-distro/pom.xml proxy-distro/src/main/assemblies/proxy-distro.xml
Date Fri, 25 Feb 2011 13:32:09 GMT
Author: zoe
Date: Fri Feb 25 13:32:08 2011
New Revision: 1074519

URL: http://svn.apache.org/viewvc?rev=1074519&view=rev
Log:
fix distribution

Modified:
    aries/branches/experimental-release-by-module/proxy/proxy-api/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/proxy-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml?rev=1074519&r1=1074518&r2=1074519&view=diff
==============================================================================
--- aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml (original)
+++ aries/branches/experimental-release-by-module/proxy/proxy-api/pom.xml Fri Feb 25 13:32:08
2011
@@ -40,6 +40,7 @@
 
 
     <properties>
+        <directory>proxy-api</directory>
         <aries.osgi.export.pkg>
             org.apache.aries.proxy;
         </aries.osgi.export.pkg>

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=1074519&r1=1074518&r2=1074519&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 Fri Feb 25 13:32:08
2011
@@ -26,29 +26,11 @@
     </parent>
 
 
-	<groupId>org.apache.aries.proxy.distro</groupId>
+	<groupId>org.apache.aries.proxy</groupId>
 	<artifactId>proxy-distro</artifactId>
 	<name>Proxy distribution</name>
 	<packaging>pom</packaging>
-    <!--
-	<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.3</version>
-		</dependency>
-    	<dependency>
-			<groupId>org.apache.aries.proxy</groupId>
-			<artifactId>org.apache.aries.proxy</artifactId>
-            <version>0.3</version>
-		</dependency>
-	</dependencies>
-    -->
+
     <modules>
         <module>../proxy-api</module>
         <module>../proxy-impl</module>

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=1074519&r1=1074518&r2=1074519&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
Fri Feb 25 13:32:08 2011
@@ -19,22 +19,54 @@
 	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">
 
-	<id>proxy-distro</id>
+	<id>distribution</id>
 
 	<formats>
 		<format>zip</format>
 	</formats>
+
 	<includeBaseDirectory>false</includeBaseDirectory>
-<!--
-	<dependencySets> 
-		<dependencySet>
-			<outputDirectory></outputDirectory>
-		</dependencySet> 
-	</dependencySets>
--->
+
+    <files>
+      <file>
+        <source>../pom.xml</source>
+        <outputDirectory>source</outputDirectory>
+       </file>
+      </files>
+
+     <fileSets>
+      <fileSet> 
+        <directory>../proxy-api</directory>
+        <outputDirectory>proxy-module-source/proxy-api</outputDirectory>
+        <excludes>
+          <exclude>**target/**</exclude>
+        </excludes>
+        </fileSet>
+      <fileSet> 
+        <directory>../proxy-impl</directory>
+        <outputDirectory>proxy-module-source/proxy-impl</outputDirectory>
+        <excludes>
+          <exclude>**target/**</exclude>
+        </excludes>
+        </fileSet>
+      <fileSet> 
+        <directory>../proxy-bundle</directory>
+        <outputDirectory>proxy-module-source/proxy-bundle</outputDirectory>
+        <excludes>
+          <exclude>**target/**</exclude>
+        </excludes>
+        </fileSet>
+      <fileSet> 
+        <directory>../proxy-itests</directory>
+        <outputDirectory>proxy-module-source/proxy-itests</outputDirectory>
+        <excludes>
+          <exclude>**target/**</exclude>
+        </excludes>
+        </fileSet>
+      </fileSets>
     <moduleSets>
         <moduleSet>
-            <sources>
+       <!--     <sources>
               <fileSets>
                   <fileSet>
                      <excludes>
@@ -45,12 +77,14 @@
                </fileSets>
                <outputDirectoryMapping>source/${module.artifactId}</outputDirectoryMapping>
             </sources>
+            -->
             <binaries>
                   <includeDependencies>false</includeDependencies>
-                  <outputDirectory>binaries</outputDirectory>
+                  <outputDirectory>proxy-module-binaries</outputDirectory>
                   <unpack>false</unpack>
 
             </binaries>
         </moduleSet>
     </moduleSets>
+    
 </assembly>



Mime
View raw message