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 20:55:01 UTC
svn commit: r956093 - in
/incubator/chemistry/opencmis/branches/dev-maven-release: ./
chemistry-opencmis-client/chemistry-opencmis-client-impl/
chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/
chemistry-opencmis-dist/ chemist...
Author: gabriele
Date: Fri Jun 18 18:55:01 2010
New Revision: 956093
URL: http://svn.apache.org/viewvc?rev=956093&view=rev
Log:
-- completed work on the assemblies
-- generated a new aggregated assembly "server-webapps" containing the three (inmemory, fileshare, browser) packages
-- added a separate module (chemistry-opencmis-dist) for easily building multi module aggregates
Added:
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml (with props)
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/ (with props)
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.classpath (with props)
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.project (with props)
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/pom.xml (with props)
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml
- copied, changed from r955984, incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml
- copied, changed from r955984, incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml (with props)
incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/docs-assembly.xml
Removed:
incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml
incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml
Modified:
incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/pom.xml
incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml
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=956093&r1=956092&r2=956093&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 18:55:01 2010
@@ -1,11 +1,15 @@
<?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"
@@ -19,7 +23,7 @@
<version>0.1.0-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
-
+
<artifactId>chemistry-opencmis-client-impl</artifactId>
<name>OpenCMIS Client Implementation</name>
@@ -56,8 +60,9 @@
<profiles>
<profile>
<!--
- call mvn test -Dorg.apache.chemistry.opencmis.client.runtime.suite.config.path=myServer.properties to
- run test using profile parameters
+ call mvn test
+ -Dorg.apache.chemistry.opencmis.client.runtime.suite.config.path=myServer.properties
+ to run test using profile parameters
-->
<activation>
<property>
@@ -78,6 +83,43 @@
</pluginManagement>
</build>
</profile>
+
+ <!--
+ Extending the default -Papache-release profile used *only*
+ during releases
+ -->
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>pack-client-with-deps</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/client-with-dependencies-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
+
</project>
Added: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml?rev=956093&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml Fri Jun 18 18:55:01 2010
@@ -0,0 +1,25 @@
+<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">
+ <id>with-dependencies</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact></useProjectArtifact>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <includes>
+ <include>${project.build.finalName}.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/assembly/client-with-dependencies-assembly.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 18 18:55:01 2010
@@ -0,0 +1,3 @@
+.settings
+
+target
Added: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.classpath
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.classpath?rev=956093&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.classpath (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.classpath Fri Jun 18 18:55:01 2010
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.classpath
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.project
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.project?rev=956093&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.project (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.project Fri Jun 18 18:55:01 2010
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>chemistry-opencmis-dist</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/.project
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/pom.xml?rev=956093&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/pom.xml (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/pom.xml Fri Jun 18 18:55:01 2010
@@ -0,0 +1,152 @@
+<?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.
+ -->
+
+<project>
+
+ <parent>
+ <artifactId>chemistry-opencmis</artifactId>
+ <groupId>org.apache.chemistry.opencmis
+ </groupId>
+ <version>0.1.0-incubating-SNAPSHOT
+ </version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>chemistry-opencmis-dist</artifactId>
+ <name>Distribution project for OpenCmis assemblies
+ </name>
+ <packaging>pom</packaging>
+
+ <!-- These dependencies are used to be added in the assambly -->
+ <dependencies>
+
+ <!-- Used for client-assembly.xml -->
+
+ <dependency>
+ <artifactId>chemistry-opencmis-client-impl</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>chemistry-opencmis-client-api</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>chemistry-opencmis-client-bindings</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>chemistry-opencmis-commons-api</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>chemistry-opencmis-commons-impl</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Used for server-assembly.xml -->
+
+ <dependency>
+ <artifactId>chemistry-opencmis-server-bindings</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <artifactId>chemistry-opencmis-server-support</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Used for server-webapps-assembly.xml -->
+
+ <dependency>
+ <artifactId>chemistry-opencmis-test-browser-app</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <artifactId>chemistry-opencmis-server-fileshare</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <artifactId>chemistry-opencmis-server-inmemory</artifactId>
+ <groupId>org.apache.chemistry.opencmis</groupId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ </dependencies>
+
+ <profiles>
+ <!--
+ Extending the default -Papache-release profile used *only*
+ during releases
+ -->
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>package-assemblies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <inherited>false</inherited>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/server-assembly.xml
+ </descriptor>
+ <descriptor>
+ src/main/assembly/client-assembly.xml
+ </descriptor>
+ <descriptor>
+ src/main/assembly/server-webapps-assembly.xml
+ </descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
\ No newline at end of file
Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml (from r955984, incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml?p2=incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml&p1=incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml&r1=955984&r2=956093&rev=956093&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/client-assembly.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/client-assembly.xml Fri Jun 18 18:55:01 2010
@@ -16,38 +16,30 @@
and limitations under the License.
-->
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
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">
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!-- To build this, run "mvn package assembly:assembly" -->
- <id>with-dependencies</id>
+ <id>client</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
- <includeSubModules>true</includeSubModules>
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useProjectArtifact>true</useProjectArtifact>
<includes>
- <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-api</include>
<include>org.apache.chemistry.opencmis:chemistry-opencmis-client-impl</include>
+ <include>org.apache.chemistry.opencmis:chemistry-opencmis-client-api</include>
<include>org.apache.chemistry.opencmis:chemistry-opencmis-client-bindings</include>
+ <include>org.apache.chemistry.opencmis:chemistry-opencmis-commons-api</include>
+ <include>org.apache.chemistry.opencmis:chemistry-opencmis-commons-impl</include>
</includes>
- <binaries>
- <outputDirectory></outputDirectory>
- <includeDependencies>true</includeDependencies>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <outputDirectory></outputDirectory>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
- <dependencySets>
+ <outputDirectory></outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
<dependencySet>
<includes>
<include>org.apache:apache-jar-resource-bundle</include>
@@ -63,5 +55,4 @@
</unpackOptions>
</dependencySet>
</dependencySets>
-
</assembly>
Copied: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml (from r955984, incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml?p2=incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml&p1=incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml&r1=955984&r2=956093&rev=956093&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/src/main/assembly/server-assembly.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml Fri Jun 18 18:55:01 2010
@@ -16,37 +16,28 @@
and limitations under the License.
-->
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
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">
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<!-- To build this, run "mvn package assembly:assembly" -->
- <id>with-dependencies</id>
+ <id>server</id>
<formats>
<format>zip</format>
<format>tar.gz</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
+ <dependencySets>
+ <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>
</includes>
- <includeSubModules>true</includeSubModules>
- <binaries>
- <outputDirectory></outputDirectory>
- <includeDependencies>true</includeDependencies>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <outputDirectory></outputDirectory>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
- <dependencySets>
+ <outputDirectory></outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
<dependencySet>
<includes>
<include>org.apache:apache-jar-resource-bundle</include>
Added: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml?rev=956093&view=auto
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml (added)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml Fri Jun 18 18:55:01 2010
@@ -0,0 +1,56 @@
+<?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.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.xsd">
+ <!-- To build this, run "mvn package assembly:assembly" -->
+ <id>server-webapps</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <useProjectArtifact>true</useProjectArtifact>
+ <includes>
+ <include>org.apache.chemistry.opencmis:chemistry-opencmis-test-browser-app</include>
+ <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-fileshare</include>
+ <include>org.apache.chemistry.opencmis:chemistry-opencmis-server-inmemory</include>
+ </includes>
+ <outputDirectory></outputDirectory>
+ <unpack>false</unpack>
+ </dependencySet>
+ <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>
+</assembly>
Propchange: incubator/chemistry/opencmis/branches/dev-maven-release/chemistry-opencmis-dist/src/main/assembly/server-webapps-assembly.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=956093&r1=956092&r2=956093&view=diff
==============================================================================
--- incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml (original)
+++ incubator/chemistry/opencmis/branches/dev-maven-release/pom.xml Fri Jun 18 18:55:01 2010
@@ -66,7 +66,7 @@
<distributionManagement>
<site>
<id>apache-site-staging</id>
- <url>scpexe://people.apache.org/home/gabriele/public_html/chemistry/opencmis/${project.version}</url>
+ <url>scpexe://people.apache.org/home/gabriele/public_html/chemistry/opencmis/${project.version}/site</url>
</site>
</distributionManagement>
@@ -176,6 +176,7 @@
<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>
+ <module>chemistry-opencmis-dist</module>
</modules>
@@ -219,7 +220,8 @@
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<!-- TODO: Add autogenerated JIRA release notes -->
- <goals>javadoc:aggregate deploy site-deploy</goals>
+ <goals>javadoc:aggregate deploy
+ site-deploy</goals>
<arguments>-Papache-release</arguments>
</configuration>
</plugin>
@@ -388,6 +390,7 @@
</activation>
<build>
<plugins>
+ <!-- Fetches docs from ${docs.download.directory} -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -395,7 +398,7 @@
<executions>
<execution>
<id>fetch-docs</id>
- <phase>verify</phase>
+ <phase>generate-resources</phase>
<goals>
<goal>exec</goal>
</goals>
@@ -415,6 +418,7 @@
</execution>
</executions>
</plugin>
+ <!-- Generates aggregated javadocs -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -425,32 +429,25 @@
<goals>
<goal>aggregate</goal>
</goals>
- <phase>prepare-package</phase>
+ <phase>generate-resources</phase>
</execution>
</executions>
</plugin>
+ <!-- Assemblies the doc package -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<inherited>false</inherited>
- <executions>
- <execution>
- <id>package-assemblies</id>
- <phase>verify</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- <inherited>false</inherited>
- <configuration>
- <descriptors>
- <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>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <attach>true</attach>
+ <descriptors>
+ <descriptor>src/main/assembly/docs-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
</plugin>
- <!-- We want to package up license resources in the JARs produced -->
+ <!--
+ We want to package up license/incubator
+ resources in the JARs produced
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-remote-resources-plugin</artifactId>
@@ -473,4 +470,5 @@
</profile>
</profiles>
+
</project>
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=956093&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 18:55:01 2010
@@ -0,0 +1,61 @@
+<?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.1"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 http://maven.apache.org/xsd/assembly-1.1.1.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>