You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by ga...@apache.org on 2010/06/18 14:47:02 UTC

svn commit: r955984 - in /incubator/chemistry/opencmis/branches/dev-maven-release: ./ ant-release-tool/ assemblies/ chemistry-opencmis-client/ chemistry-opencmis-client/chemistry-opencmis-client-api/ chemistry-opencmis-client/chemistry-opencmis-client-...

Author: gabriele
Date: Fri Jun 18 12:47:01 2010
New Revision: 955984

URL: http://svn.apache.org/viewvc?rev=955984&view=rev
Log:
-- added GPG key to KEYS
-- completed assemblies 
-- tested snapshot deployment
-- restored 2 level deep projects as working better for assemblies
-- added deprecation note for the ant-release-tool
-- moved assemblies to standard layout
-- tested wget and site mirroring

Added:
    incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/
      - copied from r955234, incubator/chemistry/opencmis/branches/dev-maven-release/release-tool/
    incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/DEPRECATED.txt   (with props)
    incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/build.xml
      - copied unchanged from r955467, incubator/chemistry/opencmis/branches/dev-maven-release/release-tool/build.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/src/main/
    incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/
    incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml
      - copied, changed from r955467, incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/client-assembly.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml   (with props)
    incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml
      - copied, changed from r955467, incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/server-server-assembly.xml
Removed:
    incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/release-tool/
Modified:
    incubator/chemistry/opencmis/branches/dev-maven-release/KEYS
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-api/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser-app/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml
    incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/KEYS
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/KEYS?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/KEYS (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/KEYS Fri Jun 18 12:47:01 2010
@@ -1851,3 +1851,61 @@ yCXnenJJSIw5VO4EpaQ/2mXqEbMbgUlwODFRp0ly
 h81BNGZaZf2uV5fSBRp49fNc4LZVJoOM5B8Z5hQ5U4iMkljJcdToI5W/QA==
 =mp8c
 -----END PGP PUBLIC KEY BLOCK-----
+
+
+pub   4096R/D0383AE5 2010-06-12
+uid                  Gabriele Columbro (CODE SIGNING KEY) <ga...@apache.org>
+sub   4096R/9A858E5C 2010-06-12
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
+
+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
+TtaLctyG9ObqSGVXtCDchQh/weQZUuPv
+=22+H
+-----END PGP PUBLIC KEY BLOCK-----

Added: incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/DEPRECATED.txt
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/DEPRECATED.txt?rev=955984&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/DEPRECATED.txt (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/DEPRECATED.txt Fri Jun 18 12:47:01 2010
@@ -0,0 +1,3 @@
+The Apache Ant build.xml release process is now deprecated in favor of standard Apache Maven based release process.
+
+See documentation https://cwiki.apache.org/confluence/display/CMIS/OpenCMIS+Maven+Release+Documentation for details.
\ No newline at end of file

Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/ant-release-tool/DEPRECATED.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-api/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-api/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-api/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,9 +15,9 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-client</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>chemistry-opencmis-client-api</artifactId>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-bindings/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,9 +15,9 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-client</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>chemistry-opencmis-client-bindings</artifactId>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,11 +15,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-client</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>chemistry-opencmis-client-impl</artifactId>
     <name>OpenCMIS Client Implementation</name>
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-api/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,12 +15,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-commons</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-
     <artifactId>chemistry-opencmis-commons-api</artifactId>
     <name>OpenCMIS Commons API</name>
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/pom.xml Fri Jun 18 12:47:01 2010
@@ -19,11 +19,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-commons</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>chemistry-opencmis-commons-impl</artifactId>
     <name>OpenCMIS Commons Implementation</name>
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,11 +15,12 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-server</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
+
     <artifactId>chemistry-opencmis-server-bindings</artifactId>
     <name>OpenCMIS Server Implementation</name>
     <packaging>war</packaging>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,12 +15,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-server</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-
     <artifactId>chemistry-opencmis-server-fileshare</artifactId>
     <name>OpenCMIS FileShare Server Implementation</name>
     <packaging>war</packaging>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,12 +15,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-server</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
-
     <artifactId>chemistry-opencmis-server-inmemory</artifactId>
     <name>OpenCMIS InMemory Server Implementation</name>
     <packaging>war</packaging>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-server/chemistry-opencmis-server-support/pom.xml Fri Jun 18 12:47:01 2010
@@ -7,11 +7,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-server</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>chemistry-opencmis-server-support</artifactId>
     <name>OpenCMIS Server Support</name>
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser-app/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser-app/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser-app/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser-app/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,9 +15,9 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-test</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-browser/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,11 +15,11 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-test</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
-
+    
     <artifactId>chemistry-opencmis-test-browser</artifactId>
     <name>OpenCMIS Browser</name>
     <packaging>jar</packaging>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/pom.xml Fri Jun 18 12:47:01 2010
@@ -1,167 +1,174 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-	<!--
-		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.
-	-->
+    <!--
+        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.
+    -->
 
 <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">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-test</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
 
-	<artifactId>chemistry-opencmis-test-fit</artifactId>
-	<name>OpenCMIS Full Integration Tests</name>
-	<packaging>war</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<overlays>
-						<overlay>
-						</overlay>
-						<overlay>
-							<groupId>${project.groupId}</groupId>
-							<artifactId>chemistry-opencmis-server-inmemory</artifactId>
-						</overlay>
-					</overlays>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>failsafe-maven-plugin</artifactId>
-				<version>2.4.3-alpha-1</version>
-				<configuration>
-					<outputName>integration-test</outputName>
-					<encoding>UTF-8</encoding>
-					<forkMode>once</forkMode>
-					<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
-					<argLine>-Xmx128m</argLine>
-				</configuration>
-				<executions>
-					<execution>
-						<id>integration-test</id>
-						<goals>
-							<goal>integration-test</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>verify</id>
-						<goals>
-							<goal>verify</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.22</version>
-				<configuration>
-					<scanIntervalSeconds>10</scanIntervalSeconds>
-					<stopPort>19966</stopPort>
-					<stopKey>foo</stopKey>
-					<connectors>
-						<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-							<port>19080</port>
-							<host>0.0.0.0</host>
-						</connector>
-					</connectors>
-					<webAppConfig>
-						<contextPath>/opencmis</contextPath>
-					</webAppConfig>
-				</configuration>
-				<executions>
-					<execution>
-						<id>start-jetty</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>run-war</goal>
-						</goals>
-						<configuration>
-							<scanIntervalSeconds>0</scanIntervalSeconds>
-							<daemon>true</daemon>
-						</configuration>
-					</execution>
-					<execution>
-						<id>stop-jetty</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>stop</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-				<reportSets>
-					<reportSet>
-						<id>integration-tests</id>
-						<reports>
-							<report>report-only</report>
-						</reports>
-						<configuration>
-							<outputName>failsafe-report</outputName>
-							<reportsDirectories>
-								<reportsDirectory>${basedir}/target/failsafe-reports</reportsDirectory>
-							</reportsDirectories>
-						</configuration>
-					</reportSet>
-				</reportSets>
-			</plugin>
-		</plugins>
-	</reporting>
-
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>chemistry-opencmis-commons-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>chemistry-opencmis-client-api</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>chemistry-opencmis-client-impl</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>chemistry-opencmis-client-bindings</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>chemistry-opencmis-server-inmemory</artifactId>
-			<version>${project.version}</version>
-			<type>war</type>
-		</dependency>
-	</dependencies>
+    <artifactId>chemistry-opencmis-test-fit</artifactId>
+    <name>OpenCMIS Full Integration Tests</name>
+    <packaging>war</packaging>
+
+    <build>
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <overlays>
+                        <overlay>
+                        </overlay>
+                        <overlay>
+                            <groupId>${project.groupId}</groupId>
+                            <artifactId>chemistry-opencmis-server-inmemory</artifactId>
+                        </overlay>
+                    </overlays>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>failsafe-maven-plugin</artifactId>
+                <version>2.4.3-alpha-1</version>
+                <configuration>
+                    <outputName>integration-test</outputName>
+                    <encoding>UTF-8</encoding>
+                    <forkMode>once</forkMode>
+                    <forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
+                    <argLine>-Xmx128m</argLine>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.22</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <stopPort>19966</stopPort>
+                    <stopKey>foo</stopKey>
+                    <connectors>
+                        <connector
+                            implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>19080</port>
+                            <host>0.0.0.0</host>
+                        </connector>
+                    </connectors>
+                    <webAppConfig>
+                        <contextPath>/opencmis</contextPath>
+                    </webAppConfig>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>run-war</goal>
+                        </goals>
+                        <configuration>
+                            <scanIntervalSeconds>0</scanIntervalSeconds>
+                            <daemon>true</daemon>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <reportSets>
+                    <reportSet>
+                        <id>integration-tests</id>
+                        <reports>
+                            <report>report-only</report>
+                        </reports>
+                        <configuration>
+                            <outputName>failsafe-report</outputName>
+                            <reportsDirectories>
+                                <reportsDirectory>${basedir}/target/failsafe-reports</reportsDirectory>
+                            </reportsDirectories>
+                        </configuration>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>chemistry-opencmis-commons-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>chemistry-opencmis-client-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>chemistry-opencmis-client-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>chemistry-opencmis-client-bindings</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>chemistry-opencmis-server-inmemory</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
 </project>

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/resources/log4j.properties Fri Jun 18 12:47:01 2010
@@ -7,7 +7,7 @@ log4j.appender.O=org.apache.log4j.Consol
 
 # File
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=log4j.log
+log4j.appender.R.File=${project.build.directory}/log4j.log
 
 # Control the maximum log file size
 log4j.appender.R.MaxFileSize=100KB

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tck/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,9 +15,9 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-test</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-tools/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,9 +15,9 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-test</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-test/chemistry-opencmis-test-util/pom.xml Fri Jun 18 12:47:01 2010
@@ -15,9 +15,9 @@
 
     <parent>
         <groupId>org.apache.chemistry.opencmis</groupId>
-        <artifactId>chemistry-opencmis-test</artifactId>
+        <artifactId>chemistry-opencmis</artifactId>
         <version>0.1.0-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
 

Modified: incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml?rev=955984&r1=955983&r2=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml Fri Jun 18 12:47:01 2010
@@ -63,6 +63,13 @@
         <url>http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk</url>
     </scm>
 
+    <distributionManagement>
+        <site>
+            <id>site-staging</id>
+            <url>scpexe://people.apache.org/home/gabriele/public_html/opencmis/</url>
+        </site>
+    </distributionManagement>
+
     <issueManagement>
         <system>Jira</system>
         <url>https://issues.apache.org/jira/browse/CMIS</url>
@@ -153,10 +160,21 @@
 
     <!-- Project Environment -->
     <modules>
-        <module>chemistry-opencmis-commons</module>
-        <module>chemistry-opencmis-server</module>
-        <module>chemistry-opencmis-client</module>
-        <module>chemistry-opencmis-test</module>
+        <module>chemistry-opencmis-commons/chemistry-opencmis-commons-api</module>
+        <module>chemistry-opencmis-commons/chemistry-opencmis-commons-impl</module>
+        <module>chemistry-opencmis-client/chemistry-opencmis-client-api</module>
+        <module>chemistry-opencmis-client/chemistry-opencmis-client-impl</module>
+        <module>chemistry-opencmis-client/chemistry-opencmis-client-bindings</module>
+        <module>chemistry-opencmis-server/chemistry-opencmis-server-bindings</module>
+        <module>chemistry-opencmis-server/chemistry-opencmis-server-support</module>
+        <module>chemistry-opencmis-server/chemistry-opencmis-server-inmemory</module>
+        <module>chemistry-opencmis-server/chemistry-opencmis-server-fileshare</module>
+        <module>chemistry-opencmis-test/chemistry-opencmis-test-fit</module>
+        <module>chemistry-opencmis-test/chemistry-opencmis-test-tck</module>
+        <module>chemistry-opencmis-test/chemistry-opencmis-test-tools</module>
+        <module>chemistry-opencmis-test/chemistry-opencmis-test-util</module>
+        <module>chemistry-opencmis-test/chemistry-opencmis-test-browser</module>
+        <module>chemistry-opencmis-test/chemistry-opencmis-test-browser-app</module>
     </modules>
 
 
@@ -165,7 +183,7 @@
         <maven.compile.source>1.5</maven.compile.source>
         <maven.compile.target>1.5</maven.compile.target>
         <docs.start.url>http://incubator.apache.org/chemistry/index.html</docs.start.url>
-        <docs.download.directory>${project.build.directory}/site/docs</docs.download.directory>
+        <docs.download.directory>${project.build.directory}/site</docs.download.directory>
     </properties>
 
     <build>
@@ -181,6 +199,15 @@
                     <artifactId>maven-gunit-plugin</artifactId>
                     <version>3.1.3</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-5</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>exec-maven-plugin</artifactId>
+                    <version>1.1</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -191,8 +218,9 @@
                 <configuration>
                     <useReleaseProfile>false</useReleaseProfile>
                     <!-- TODO: Add autogenerated JIRA release notes -->
-                    <goals>javadoc:aggregate deploy site-deploy</goals>
-                    <arguments>-Papache-release</arguments>
+                    <goals>javadoc:aggregate deploy
+                        site-deploy</goals>
+                    <arguments>-Papache-release,pack-assemblies</arguments>
                 </configuration>
             </plugin>
             <plugin>
@@ -319,6 +347,16 @@
             <type>jar</type>
             <scope>test</scope>
         </dependency>
+        <!--
+            Added to gather the latest Apache licenses to be added in
+            assemblies
+        -->
+        <dependency>
+            <groupId>org.apache</groupId>
+            <artifactId>apache-jar-resource-bundle</artifactId>
+            <version>1.4</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <reporting>
@@ -353,11 +391,11 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.1</version>
+                        <inherited>false</inherited>
                         <executions>
                             <execution>
                                 <id>fetch-docs</id>
-                                <phase>generate-resources</phase>
+                                <phase>verify</phase>
                                 <goals>
                                     <goal>exec</goal>
                                 </goals>
@@ -365,61 +403,67 @@
                                     <executable>wget</executable>
                                     <arguments>
                                         <argument>--directory-prefix=${docs.download.directory}</argument>
-                                        <argument>--recursive</argument>
-                                        <argumnet>--convert-links</argumnet>
-                                        <argument>--include=/chemistry</argument>
-                                        <argument>--accept=opencmis*,index.html,css,js,gif,png,jpg</argument>
+                                        <argument>--domains=incubator.apache.org</argument>
+                                        <argumnet>--mirror</argumnet>
+                                        <argumnet>-k</argumnet>
+                                        <argumnet>-np</argumnet>
+                                        <argument>--include-directories=/chemistry </argument>
                                         <argument>--exclude-directories=/chemistry/javadoc</argument>
                                         <argument>${docs.start.url}</argument>
                                     </arguments>
                                 </configuration>
-                                <inherited>false</inherited>
                             </execution>
                         </executions>
                     </plugin>
                     <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.2-beta-5</version>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>2.7</version>
                         <executions>
                             <execution>
-                                <id>pack-source</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>assemblies/source-assembly.xml</descriptor>
-                                    </descriptors>
-                                    <attach>true</attach>
-                                    <descriptorRef>src</descriptorRef>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>pack-client</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>assemblies/client-assembly.xml</descriptor>
-                                    </descriptors>
-                                    <attach>true</attach>
-                                </configuration>
+                                <id>generate-docs</id>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>prepare-package</phase>
                             </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <inherited>false</inherited>
+                        <executions>
                             <execution>
-                                <id>pack-server</id>
-                                <phase>package</phase>
+                                <id>package-assemblies</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>assembly</goal>
+                                </goals>
+                                <inherited>false</inherited>
                                 <configuration>
                                     <descriptors>
-                                        <descriptor>assemblies/server-assembly.xml</descriptor>
+                                        <descriptor>src/main/assembly/docs-assembly.xml</descriptor>
+                                        <descriptor>src/main/assembly/server-assembly.xml</descriptor>
+                                        <descriptor>src/main/assembly/client-assembly.xml</descriptor>
                                     </descriptors>
-                                    <attach>true</attach>
                                 </configuration>
                             </execution>
+                        </executions>
+                    </plugin>
+                    <!-- We want to package up license resources in the JARs produced -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-remote-resources-plugin</artifactId>
+                        <executions>
                             <execution>
-                                <id>pack-browser</id>
-                                <phase>package</phase>
+                                <goals>
+                                    <goal>process</goal>
+                                </goals>
                                 <configuration>
-                                    <descriptors>
-                                        <descriptor>assemblies/server-assembly.xml</descriptor>
-                                    </descriptors>
-                                    <attach>true</attach>
+                                    <resourceBundles>
+                                        <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                                        <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+                                    </resourceBundles>
                                 </configuration>
                             </execution>
                         </executions>

Copied: incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml (from r955467, incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/client-assembly.xml)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml?p2=incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml&p1=incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/client-assembly.xml&r1=955467&r2=955984&rev=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/client-assembly.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml Fri Jun 18 12:47:01 2010
@@ -20,7 +20,7 @@
     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">
     <!-- To build this, run "mvn package assembly:assembly" -->
-    <id>client-with-dependencies</id>
+    <id>with-dependencies</id>
     <formats>
         <format>zip</format>
         <format>tar.gz</format>
@@ -28,6 +28,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <moduleSets>
         <moduleSet>
+            <includeSubModules>true</includeSubModules>
             <includes>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-api</include>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-impl</include>
@@ -46,13 +47,21 @@
             </binaries>
         </moduleSet>
     </moduleSets>
-    <fileSets>
-        <fileSet>
-            <directory>.</directory>
+    <dependencySets>
+        <dependencySet>
             <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
+                <include>org.apache:apache-jar-resource-bundle</include>
             </includes>
-        </fileSet>
-    </fileSets>
+            <scope>provided</scope>
+            <outputDirectory>.</outputDirectory>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>*/*.txt</include>
+                </includes>
+                <filtered>true</filtered>
+            </unpackOptions>
+        </dependencySet>
+    </dependencySets>
+
 </assembly>

Added: incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml?rev=955984&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml Fri Jun 18 12:47:01 2010
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        Lice nsed 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">
+    <!-- To build this, run "mvn package assembly:assembly" -->
+    <id>docs</id>
+    <formats>
+        <format>zip</format>
+        <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>
+            <outputDirectory>sitedocs</outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
+            
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/site/apidocs</directory>
+            <outputDirectory>javadocs</outputDirectory>
+            <includes>
+                <include>**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml (from r955467, incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/server-server-assembly.xml)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml?p2=incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml&p1=incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/server-server-assembly.xml&r1=955467&r2=955984&rev=955984&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/assemblies/server-server-assembly.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml Fri Jun 18 12:47:01 2010
@@ -20,7 +20,7 @@
     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">
     <!-- To build this, run "mvn package assembly:assembly" -->
-    <id>server-with-dependencies</id>
+    <id>with-dependencies</id>
     <formats>
         <format>zip</format>
         <format>tar.gz</format>
@@ -29,14 +29,10 @@
     <moduleSets>
         <moduleSet>
             <includes>
-                <include>org.apache.chemistry.opencmis:chemistry-opencmis-commons-api</include>
-                <include>org.apache.chemistry.opencmis:chemistry-opencmis-commons-impl</include>
-                <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-bindings</include>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-bindings</include>
                 <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-support</include>
-                <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-inmemory</include>
-                <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-fileshare</include>
             </includes>
+            <includeSubModules>true</includeSubModules>
             <binaries>
                 <outputDirectory></outputDirectory>
                 <includeDependencies>true</includeDependencies>
@@ -50,13 +46,20 @@
             </binaries>
         </moduleSet>
     </moduleSets>
-    <fileSets>
-        <fileSet>
-            <directory>.</directory>
+    <dependencySets>
+        <dependencySet>
             <includes>
-                <include>LICENSE.txt</include>
-                <include>NOTICE.txt</include>
+                <include>org.apache:apache-jar-resource-bundle</include>
             </includes>
-        </fileSet>
-    </fileSets>
+            <scope>provided</scope>
+            <outputDirectory>.</outputDirectory>
+            <unpack>true</unpack>
+            <unpackOptions>
+                <includes>
+                    <include>*/*.txt</include>
+                </includes>
+                <filtered>true</filtered>
+            </unpackOptions>
+        </dependencySet>
+    </dependencySets>
 </assembly>