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 2011/03/22 18:59:08 UTC
svn commit: r1084272 - in /chemistry/opencmis/trunk: ./
chemistry-opencmis-dist/ chemistry-opencmis-dist/src/main/assembly/
chemistry-opencmis-server/chemistry-opencmis-server-bindings/
chemistry-opencmis-server/chemistry-opencmis-server-support/
Author: gabriele
Date: Tue Mar 22 17:59:08 2011
New Revision: 1084272
URL: http://svn.apache.org/viewvc?rev=1084272&view=rev
Log:
-- fixes https://issues.apache.org/jira/browse/CMIS-335
-- depreacated -dist-server assembly
-- added server-support jar as dependency for server-bindings
-- inverted server-support and server-bindings order in main POM to make project build
Removed:
chemistry/opencmis/trunk/chemistry-opencmis-dist/src/main/assembly/server-assembly.xml
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/ (props changed)
chemistry/opencmis/trunk/pom.xml
Modified: chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml?rev=1084272&r1=1084271&r2=1084272&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-dist/pom.xml Tue Mar 22 17:59:08 2011
@@ -133,9 +133,6 @@
<attach>true</attach>
<descriptors>
<descriptor>
- src/main/assembly/server-assembly.xml
- </descriptor>
- <descriptor>
src/main/assembly/client-assembly.xml
</descriptor>
<descriptor>
Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml?rev=1084272&r1=1084271&r2=1084272&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/pom.xml Tue Mar 22 17:59:08 2011
@@ -71,6 +71,12 @@
<artifactId>chemistry-opencmis-commons-impl</artifactId>
<version>${project.version}</version>
</dependency>
+ <!-- server-support is not a *runtime* dependency but it's added for commodity in the WAR -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>chemistry-opencmis-server-support</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Propchange: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 22 17:59:08 2011
@@ -1,7 +1,6 @@
-bin
-target
-*.iws
*.ipr
-*.iml
-.*
+*.iws
log4j.log*
+target
+bin
+.*
Modified: chemistry/opencmis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/pom.xml?rev=1084272&r1=1084271&r2=1084272&view=diff
==============================================================================
--- chemistry/opencmis/trunk/pom.xml (original)
+++ chemistry/opencmis/trunk/pom.xml Tue Mar 22 17:59:08 2011
@@ -64,7 +64,7 @@
<distributionManagement>
<site>
<id>apache-site-staging</id>
- <url>scpexe://people.apache.org/home/${apache.username}/public_html/chemistry/opencmis/${project.version}/site</url>
+ <url>${site.staging.protocol}://${site.staging.host}${site.staging.folder}</url>
</site>
</distributionManagement>
@@ -164,8 +164,8 @@
<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-bindings</module>
<module>chemistry-opencmis-server/chemistry-opencmis-server-inmemory</module>
<module>chemistry-opencmis-server/chemistry-opencmis-server-fileshare</module>
<module>chemistry-opencmis-server/chemistry-opencmis-server-jcr</module>
@@ -186,6 +186,11 @@
<maven.compile.target>1.5</maven.compile.target>
<docs.start.url>http://chemistry.apache.org/java/opencmis.html</docs.start.url>
<docs.download.directory>${project.build.directory}/downloaded-site</docs.download.directory>
+ <!-- Site label can be overriden on the command line to deploy to distinct location during site development -->
+ <site.label>${project.version}</site.label>
+ <site.staging.protocol>scpexe</site.staging.protocol>
+ <site.staging.host>people.apache.org</site.staging.host>
+ <site.staging.folder>/home/${apache.username}/public_html/chemistry/opencmis/${site.label}/site</site.staging.folder>
<parentBasedir>${project.basedir}</parentBasedir>
</properties>
@@ -374,7 +379,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <inherited>false</inherited>
<configuration>
<aggregate>true</aggregate>
<reportsDirectories>