chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gabri...@apache.org
Subject svn commit: r991545 - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-dist/src/main/assembly/ chemistry-opencmis-dist/src/main/resources/ src/main/assembly/
Date Wed, 01 Sep 2010 14:01:47 GMT
Author: gabriele
Date: Wed Sep  1 14:01:47 2010
New Revision: 991545

URL: http://svn.apache.org/viewvc?rev=991545&view=rev
Log:
-- updated custom assemblies legal aspects
-- removed DEPENDENCIES and NOTICE from docs package (not needed)
-- added generic DEPENDENCIES and NOTICE in other commodity packages: this files point the
user to the contained per artifact maven generated META-INF/DEPENDENCIES and META-INF/LICENSE
-- general policy is: J2EE artifacts have all legal info under META-INF, non J2EE artifacts
have everything under the root of the archive

Added:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/DEPENDENCIES
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE
Removed:
    incubator/chemistry/opencmis/trunk/src/main/assembly/dev-client-assembly.xml
Modified:
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml
    incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml
    incubator/chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml?rev=991545&r1=991544&r2=991545&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml
Wed Sep  1 14:01:47 2010
@@ -29,7 +29,6 @@
     <dependencySets>
         <dependencySet>
             <useTransitiveDependencies>true</useTransitiveDependencies>
-            <useProjectArtifact>true</useProjectArtifact>
             <includes>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-impl</include>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-api</include>
@@ -40,19 +39,24 @@
             <outputDirectory></outputDirectory>
             <unpack>false</unpack>
         </dependencySet>
-        <dependencySet>
+    </dependencySets>
+    <fileSets>
+        <!-- standard license and disclaimer -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
             <includes>
-                <include>org.apache:apache-jar-resource-bundle</include>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
             </includes>
-            <scope>provided</scope>
-            <outputDirectory>.</outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <includes>
-                    <include>*/*.txt</include>
-                </includes>
-                <filtered>true</filtered>
-            </unpackOptions>
-        </dependencySet>
-    </dependencySets>
+        </fileSet>
+    </fileSets>
 </assembly>

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml?rev=991545&r1=991544&r2=991545&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml
Wed Sep  1 14:01:47 2010
@@ -30,7 +30,6 @@
         <dependencySet>
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <useTransitiveFiltering>false</useTransitiveFiltering>
-            <useProjectArtifact>true</useProjectArtifact>
             <includes>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-bindings</include>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-support</include>
@@ -38,19 +37,24 @@
             <outputDirectory></outputDirectory>
             <unpack>false</unpack>
         </dependencySet>
-        <dependencySet>
+    </dependencySets>
+    <fileSets>
+        <!-- license, readme, etc. calculated at build time -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
             <includes>
-                <include>org.apache:apache-jar-resource-bundle</include>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
             </includes>
-            <scope>provided</scope>
-            <outputDirectory>.</outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <includes>
-                    <include>*/*.txt</include>
-                </includes>
-                <filtered>true</filtered>
-            </unpackOptions>
-        </dependencySet>
-    </dependencySets>
+        </fileSet>
+    </fileSets>
 </assembly>

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml?rev=991545&r1=991544&r2=991545&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml
(original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml
Wed Sep  1 14:01:47 2010
@@ -38,19 +38,24 @@
             <outputDirectory></outputDirectory>
             <unpack>false</unpack>
         </dependencySet>
-        <dependencySet>
+    </dependencySets>
+    <fileSets>
+        <!-- license, readme, etc. calculated at build time -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>/</outputDirectory>
             <includes>
-                <include>org.apache:apache-jar-resource-bundle</include>
+                <include>DEPENDENCIES</include>
+                <include>NOTICE</include>
             </includes>
-            <scope>provided</scope>
-            <outputDirectory>.</outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <includes>
-                    <include>*/*.txt</include>
-                </includes>
-                <filtered>true</filtered>
-            </unpackOptions>
-        </dependencySet>
-    </dependencySets>
+        </fileSet>
+    </fileSets>
 </assembly>

Added: incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/DEPENDENCIES?rev=991545&view=auto
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/DEPENDENCIES
(added)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/DEPENDENCIES
Wed Sep  1 14:01:47 2010
@@ -0,0 +1,4 @@
+Chemistry OpenCMIS distribution package
+
+For a complete description of dependencies used by JARs/WARs contained in this package, 
+please refer to the META-INF/DEPENDENCIES file contained in each OpenCMIS artifact 
\ No newline at end of file

Added: incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE?rev=991545&view=auto
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE (added)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/resources/NOTICE Wed
Sep  1 14:01:47 2010
@@ -0,0 +1,4 @@
+Chemistry OpenCMIS distribution package
+
+For a complete listing ofÊLicense Notices for 3rd party libraries shipped by JARs/WARs contained
in this package, 
+please refer to the META-INF/NOTICE file contained in each OpenCMIS artifact.
\ No newline at end of file

Modified: incubator/chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml?rev=991545&r1=991544&r2=991545&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml (original)
+++ incubator/chemistry/opencmis/trunk/src/main/assembly/docs-assembly.xml Wed Sep  1 14:01:47
2010
@@ -26,22 +26,6 @@
         <format>tar.gz</format>
     </formats>
     <includeBaseDirectory>false</includeBaseDirectory>
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>org.apache:apache-jar-resource-bundle</include>
-            </includes>
-            <scope>provided</scope>
-            <outputDirectory>.</outputDirectory>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <includes>
-                    <include>*/*.txt</include>
-                </includes>
-                <filtered>true</filtered>
-            </unpackOptions>
-        </dependencySet>
-    </dependencySets>
     <fileSets>
         <fileSet>
             <directory>${project.build.directory}/site/incubator.apache.org/chemistry</directory>
@@ -57,5 +41,14 @@
                 <include>**</include>
             </includes>
         </fileSet>
+        <!-- license, readme, etc. calculated at build time -->
+        <fileSet>
+            <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>DEPENDENCIES</exclude>
+                <exclude>NOTICE</exclude>
+            </excludes>
+        </fileSet>
     </fileSets>
 </assembly>



Mime
View raw message